X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpathname.lisp;h=deb6343bb5136b9af8e6b345df20b5737e3782d8;hb=b7d22ded1428e8d3e87c37164aa6742dd28aa6ce;hp=18c14b9f37cd6ced1b3f7d1c163b56f12f508512;hpb=fec3614baf361523a4fb154ed80d9b73e1452b2d;p=sbcl.git

diff --git a/src/code/pathname.lisp b/src/code/pathname.lisp
index 18c14b9..deb6343 100644
--- a/src/code/pathname.lisp
+++ b/src/code/pathname.lisp
@@ -25,6 +25,7 @@
   (unparse-directory (missing-arg) :type function)
   (unparse-file (missing-arg) :type function)
   (unparse-enough (missing-arg) :type function)
+  (unparse-directory-separator (missing-arg) :type simple-string)
   (customary-case (missing-arg) :type (member :upper :lower)))
 
 (def!method print-object ((host host) stream)
@@ -35,22 +36,23 @@
              (: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))))
                        (unparse-directory #'unparse-logical-directory)
                        (unparse-file #'unparse-logical-file)
                        (unparse-enough #'unparse-enough-namestring)
+                       (unparse-directory-separator ";")
                        (customary-case :upper)))
-  (name "" :type simple-base-string)
+  (name "" :type simple-string)
   (translations nil :type list)
   (canon-transls nil :type list))
 
@@ -73,7 +75,7 @@
 ;;; all pathname components
 (eval-when (#-sb-xc :compile-toplevel :load-toplevel :execute)
   (def!type pathname-component-tokens ()
-    '(member nil :unspecific :wild)))
+    '(member nil :unspecific :wild :unc)))
 
 (sb!xc:defstruct (pathname (:conc-name %pathname-)
                            (:constructor %make-pathname (host
@@ -124,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))))