Changeset 11202

Timestamp:

Oct 23, 2008, 9:50:17 AM (12 years ago)

Author:

gb

Message:

PATHNAME-ENCODING-NAME returns an encoding name, even on platforms
(darwin, windows) where it's hardwired. On those platforms,
SET-PATHNAME-ENCODING-NAME returns the hardwired name.

FD-OPEN-PATH split off from FD-OPEN, sometimes pays attention
to PATHNAME-ENCODING-NAME.

File:

• trunk/source/level-0/l0-io.lisp (modified) (3 diffs)

trunk/source/level-0/l0-io.lisp

@@ -197 +197 @@
 (let* ((pathname-encoding-name ()))
   (defun pathname-encoding-name ()
-    pathname-encoding-name)
+    #+darwin-target :utf-8
+    #+windows-target :utf-16le
+    #-(or darwin-target windows-target) pathname-encoding-name)
   (defun set-pathname-encoding-name (new)
     #+(or darwin-target windows-target) (declare (ignore new))
+    #+darwin-target :utf-8
+    #+windows-target :utf-16le
     #-(or darwin-target windows-target)
     (let* ((encoding (ensure-character-encoding new)))
@@ -207 +211 @@
 
 
-    
-(defun fd-open (path flags &optional (create-mode #o666))
-  (with-filename-cstrs ((p path))
-    (let* ((fd (int-errno-ffcall
+(defun fd-open-path (p flags create-mode)
+  (let* ((fd (int-errno-ffcall
               (%kernel-import target::kernel-import-lisp-open)
               :address p :int flags :mode_t create-mode :int)))
@@ -221 +223 @@
                 (%kernel-import target::kernel-import-lisp-open)
                 :address p :int flags :mode_t create-mode :int)))
-    fd)))
+    fd))
+
+(defun fd-open (path flags &optional (create-mode #o666))
+  #+darwin-target (with-utf-8-cstrs ((p path))
+                    (fd-open-path p flags create-mode))
+  #+windows-target (with-native-utf-16-cstrs ((p path))
+                     (fd-open-path p flags create-mode))
+  #-(or darwin-target windows-target)
+  (let* ((encoding (pathname-encoding-name)))
+    (if encoding
+      (with-encoded-cstrs encoding ((p path))
+        (fd-open-path p flags create-mode))
+      (with-cstrs ((p path))
+        (fd-open-path p flags create-mode)))))
 
 (defun fd-chmod (fd mode)