Changeset 10893

Timestamp:

09/12/05 14:38:17 (3 years ago)

Author:

rtoy

Message:

Fix some issues with printing (make-pathname :directory '(:relative)),
which used to print as #p"", and with reading #p".", #p"./".

code/filesys.lisp:
o When parsing a unix namestring, delete any "." elements of the

directory list.

o If we've parsed a namestring such that the file name is ".", replace

that with :name NIL and adjust the :directory component
appropriately, because on Unix, "." can't be the name of a file.

o Make :directory '(:relative) be printed as "./"

code/pathname.lisp:
o If the :directory argument to MAKE-PATHNAME contains strings with

#\/, print a warning that this is not a valid element.

o Remove all "."'s from a :relative directory component.

Files:

• trunk/src/code/pathname.lisp (modified) (1 diff)

trunk/src/code/pathname.lisp

@@ -733 +733 @@
                  (member :absolute dir))))
       (when (and d (rest d) (member (second d) '(:up :back)))
-        (error 'file-error)))
+        ;; What should we put in the for pathname part of file-error?
+        ;; I'm just going to use the directory but removing the
+        ;; offending :up or :back.  Or would just (make-pathname) be
+        ;; enough?
+        ;;
+        ;; Or instead of checking here, we could check whenever we
+        ;; "use" the file system (CLHS 19.2.2.4.3).  But that's a lot
+        ;; harder to do.
+        (error 'simple-file-error
+               :pathname (make-pathname :directory (remove-if #'(lambda (x)
+                                                                  (member x '(:up :back)))
+                                                              dir))
+               :format-control "Illegal pathname: ~
+                                Directory with ~S immediately followed by ~S"
+               :format-arguments (list (first d) (second d)))))
     
     (macrolet ((pick (var varp field)