Raymond Toy pushed to branch issue-162-filename-encoding-no-encoding at cmucl / cmucl
Commits:
-
7c44d848
by Raymond Toy at 2023-01-19T15:30:06-08:00
3 changed files:
Changes:
| ... | ... | @@ -373,7 +373,7 @@ |
| 373 | 373 | ;; Set filename encoding to NIL to bypass any encoding; it's not
|
| 374 | 374 | ;; needed to open the aliases file. NIL means the pathname string is passed as is where only the low 8 bits of the
|
| 375 | 375 | (let ((*package* (find-package "KEYWORD"))
|
| 376 | - (unix::*filename-encoding* :no-encoding))
|
|
| 376 | + (unix::*filename-encoding* :null))
|
|
| 377 | 377 | (with-open-file (stm "ext-formats:aliases" :if-does-not-exist nil
|
| 378 | 378 | :external-format :iso8859-1)
|
| 379 | 379 | (when stm
|
| ... | ... | @@ -493,7 +493,7 @@ |
| 493 | 493 | ;; encoding to NIL because we don't need any special
|
| 494 | 494 | ;; encoding to open the format files.
|
| 495 | 495 | (let* ((*print-readably* nil)
|
| 496 | - (unix::*filename-encoding* :no-encoding)
|
|
| 496 | + (unix::*filename-encoding* :null)
|
|
| 497 | 497 | (*package* (find-package "STREAM"))
|
| 498 | 498 | (lisp::*enable-package-locked-errors* nil)
|
| 499 | 499 | (s (open (format nil "ext-formats:~(~A~).lisp" name)
|
| ... | ... | @@ -1157,7 +1157,7 @@ character and illegal outputs are replaced by a question mark.") |
| 1157 | 1157 | (unless (find-external-format filenames)
|
| 1158 | 1158 | (error (intl:gettext "Can't find external-format ~S.") filenames))
|
| 1159 | 1159 | (setq filenames (ef-name (find-external-format filenames)))
|
| 1160 | - (when (and (not (eq unix::*filename-encoding* :no-encoding))
|
|
| 1160 | + (when (and (not (eq unix::*filename-encoding* :null))
|
|
| 1161 | 1161 | (not (eq unix::*filename-encoding* filenames)))
|
| 1162 | 1162 | (cerror (intl:gettext "Change it anyway.")
|
| 1163 | 1163 | (intl:gettext "The external-format for encoding filenames is already set.")))
|
| ... | ... | @@ -343,7 +343,7 @@ |
| 343 | 343 | #-gengc (setf unix::*interrupt-pending* nil)
|
| 344 | 344 | (setf *type-system-initialized* nil)
|
| 345 | 345 | (setf *break-on-signals* nil)
|
| 346 | - (setf unix::*filename-encoding* :no-encoding)
|
|
| 346 | + (setf unix::*filename-encoding* :null)
|
|
| 347 | 347 | #+gengc (setf conditions::*handler-clusters* nil)
|
| 348 | 348 | (setq intl::*default-domain* "cmucl")
|
| 349 | 349 | (setq intl::*locale* "C")
|
| ... | ... | @@ -28,17 +28,17 @@ |
| 28 | 28 | (defvar *filename-encoding* :no-encoding
|
| 29 | 29 | "The encoding to use for converting a namestring to a string that can
|
| 30 | 30 | be used by the operations system. It must be a valid
|
| 31 | - external-format name or :NO-ENCODING. :NO-ENCODING means the string
|
|
| 31 | + external-format name or :NULL. :NULL means the string
|
|
| 32 | 32 | is passed as is to the operating system. The operating system will
|
| 33 | 33 | get the low 8 bits of each UTF-16 code unit of the string.")
|
| 34 | 34 | |
| 35 | 35 | (eval-when (:compile-toplevel :load-toplevel :execute)
|
| 36 | 36 | (defmacro %name->file (string)
|
| 37 | - `(if (eql *filename-encoding* :no-encoding)
|
|
| 37 | + `(if (eql *filename-encoding* :nul)
|
|
| 38 | 38 | ,string
|
| 39 | 39 | (string-encode ,string *filename-encoding*)))
|
| 40 | 40 | (defmacro %file->name (string)
|
| 41 | - `(if (eql *filename-encoding* :no-encoding)
|
|
| 41 | + `(if (eql *filename-encoding* :null)
|
|
| 42 | 42 | ,string
|
| 43 | 43 | (string-decode ,string *filename-encoding*))))
|
| 44 | 44 |