X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpathname.lisp;h=bd0471faa40ecf30a95f1378b21fcab11d1f939c;hb=5762f26aae78beaead9919074963f67d92794599;hp=cea8b1381bf56aac5316038da9de34a579536a21;hpb=54b330585ed41edeb93a289f0e59aec67fa9ded9;p=sbcl.git

diff --git a/src/code/pathname.lisp b/src/code/pathname.lisp
index cea8b13..bd0471f 100644
--- a/src/code/pathname.lisp
+++ b/src/code/pathname.lisp
@@ -36,14 +36,14 @@
              (:include host
                        (parse #'parse-logical-namestring)
                        (parse-native
-                        (lambda (x)
+                        (lambda (&rest x)
                           (error "called PARSE-NATIVE-NAMESTRING using a ~
-                                  logical host: ~S" x)))
+                                  logical host: ~S" (first x))))
                        (unparse #'unparse-logical-namestring)
                        (unparse-native
-                        (lambda (x)
+                        (lambda (&rest x)
                           (error "called NATIVE-NAMESTRING using a ~
-                                  logical host: ~S" x)))
+                                  logical host: ~S" (first x))))
                        (unparse-host
                         (lambda (x)
                           (logical-host-name (%pathname-host x))))
@@ -126,3 +126,46 @@
                                                   name
                                                   type
                                                   version))))
+
+;;; This is used both for Unix and Windows: while we accept both
+;;; \ and / as directory separators on Windows, we print our
+;;; own always with /, which is much less confusing what with
+;;; being \ needing to be escaped.
+(defun unparse-physical-directory (pathname)
+  (declare (pathname pathname))
+  (unparse-physical-directory-list (%pathname-directory pathname)))
+
+(defun unparse-physical-directory-list (directory)
+  (declare (list directory))
+  (collect ((pieces))
+    (when directory
+      (ecase (pop directory)
+       (:absolute
+        (let ((next (pop directory)))
+          (cond ((eq :home next)
+                 (pieces "~"))
+                ((and (consp next) (eq :home (car next)))
+                 (pieces "~")
+                 (pieces (second next)))
+                ((and (plusp (length next)) (char= #\~ (char next 0)))
+                 ;; The only place we need to escape the tilde.
+                 (pieces "\\")
+                 (pieces next))
+                (next
+                 (push next directory)))
+          (pieces "/")))
+        (:relative))
+      (dolist (dir directory)
+        (typecase dir
+         ((member :up)
+          (pieces "../"))
+         ((member :back)
+          (error ":BACK cannot be represented in namestrings."))
+         ((member :wild-inferiors)
+          (pieces "**/"))
+         ((or simple-string pattern (member :wild))
+          (pieces (unparse-physical-piece dir))
+          (pieces "/"))
+         (t
+          (error "invalid directory component: ~S" dir)))))
+    (apply #'concatenate 'simple-string (pieces))))