From: Nathan Froyd Date: Thu, 11 Aug 2005 15:08:39 +0000 (+0000) Subject: 0.9.3.42: X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=bb8e5ebfbc575236a3061f0a2d38ad616d246a87;p=sbcl.git 0.9.3.42: Apply patch from NIIMI Satoshi (sbcl-devel 11 August 2005) to fix issues with FreeBSD (and maybe other BSDs as well). --- diff --git a/src/code/fd-stream.lisp b/src/code/fd-stream.lisp index 70c0b57..0ef85b1 100644 --- a/src/code/fd-stream.lisp +++ b/src/code/fd-stream.lisp @@ -1216,7 +1216,10 @@ ,resync-function) *external-formats*))))) -(define-external-format (:latin-1 :latin1 :iso-8859-1) +;;; Multiple names for the :ISO{,-}8859-* families are needed because on +;;; FreeBSD (and maybe other BSD systems), nl_langinfo("LATIN-1") will +;;; return "ISO8859-1" instead of "ISO-8859-1". +(define-external-format (:latin-1 :latin1 :iso-8859-1 :iso8859-1) 1 t (if (>= bits 256) (stream-encoding-error-and-handle stream bits) @@ -1283,7 +1286,7 @@ (latin-9-reverse-2 (make-array 16 :element-type '(unsigned-byte 8) :initial-contents '(#xa6 #xa8 #xbc #xbd 0 0 0 0 #xbe 0 0 0 #xa4 #xb4 #xb8 0)))) - (define-external-format (:latin-9 :latin9 :iso-8859-15) + (define-external-format (:latin-9 :latin9 :iso-8859-15 :iso8859-15) 1 t (setf (sap-ref-8 sap tail) (if (< bits 256) diff --git a/src/code/octets.lisp b/src/code/octets.lisp index d0f2134..751a039 100644 --- a/src/code/octets.lisp +++ b/src/code/octets.lisp @@ -663,10 +663,10 @@ one-past-the-end" (defparameter *external-format-functions* '(((:ascii :us-ascii :ansi_x3.4-1968 :iso-646 :iso-646-us :|646|) ascii->string-aref string->ascii) - ((:latin1 :latin-1 :iso-8859-1) + ((:latin1 :latin-1 :iso-8859-1 :iso8859-1) latin1->string-aref string->latin1) #!+sb-unicode - ((:latin9 :latin-9 :iso-8859-15) + ((:latin9 :latin-9 :iso-8859-15 :iso8859-15) latin9->string-aref string->latin9) ((:utf8 :utf-8) utf8->string-aref string->utf8))) diff --git a/version.lisp-expr b/version.lisp-expr index a346d81..952d223 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.9.3.41" +"0.9.3.42"