From: Nikodemus S. <de...@us...> - 2006-10-28 09:57:11
|
Update of /cvsroot/sbcl/sbcl/src/code In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv2303/src/code Modified Files: filesys.lisp target-pathname.lisp unix.lisp win32-pathname.lisp Log Message: 0.9.18.11: whitespace * Undo whitespace damage from Window commits. Index: filesys.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/code/filesys.lisp,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- filesys.lisp 26 Oct 2006 16:07:54 -0000 1.63 +++ filesys.lisp 28 Oct 2006 09:57:01 -0000 1.64 @@ -508,8 +508,8 @@ (let ((trueishname (sb!unix:unix-resolve-links namestring))) (when trueishname (let* ((*ignore-wildcards* t) - (name (simplify-namestring - trueishname + (name (simplify-namestring + trueishname (pathname-host defaulted-pathname)))) (if (eq (sb!unix:unix-file-kind name) :directory) ;; FIXME: this might work, but it's ugly. Index: target-pathname.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/code/target-pathname.lisp,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- target-pathname.lisp 26 Oct 2006 16:07:54 -0000 1.55 +++ target-pathname.lisp 28 Oct 2006 09:57:01 -0000 1.56 @@ -858,7 +858,7 @@ (let* ((end (%check-vector-sequence-bounds namestr start end))) (multiple-value-bind (new-host device directory file type version) (cond - (host + (host (funcall (host-parse-native host) namestr start end)) ((pathname-host defaults) (funcall (host-parse-native (pathname-host defaults)) Index: unix.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/code/unix.lisp,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- unix.lisp 26 Oct 2006 16:07:54 -0000 1.70 +++ unix.lisp 28 Oct 2006 09:57:01 -0000 1.71 @@ -907,7 +907,7 @@ (if (null link) (return pathname) (let ((new-pathname - (simplify-namestring + (simplify-namestring (if (relative-unix-pathname? link) (let* ((dir-len (1+ (position #\/ pathname Index: win32-pathname.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/code/win32-pathname.lisp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- win32-pathname.lisp 26 Oct 2006 16:07:54 -0000 1.6 +++ win32-pathname.lisp 28 Oct 2006 09:57:01 -0000 1.7 @@ -109,7 +109,7 @@ for piece = (subseq namestring start end) collect (if (and (string= piece "..") rest) :up - piece))) + piece))) (name-and-type (let* ((end (first (last components))) (dot (position #\. end :from-end t))) @@ -273,7 +273,7 @@ (unless directory (go :done)) :subdir (let ((piece (pop directory))) - (typecase piece + (typecase piece ((member :up) (write-string ".." s)) (string (write-string piece s)) (t (error "ungood piece in NATIVE-NAMESTRING: ~S" piece))) @@ -410,7 +410,7 @@ (t (setf dots nil) (setf (schar dst dst-len) char) - (incf dst-len))))) + (incf dst-len))))) ;; ...finish off (when (and last-slash (not (zerop last-slash))) (case dots |