X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fwin32-pathname.lisp;h=766c0682ea8058ba3e5e6ac44ef511f9fc153c94;hb=0395c15ff8394bfaaed03050c1a7a131f197a732;hp=8edaedae0dc9b1092f9ba8f6c1d6473c11ce6b08;hpb=0567612118d44cde39bb41058a4d06e771fcf0c6;p=sbcl.git diff --git a/src/code/win32-pathname.lisp b/src/code/win32-pathname.lisp index 8edaeda..766c068 100644 --- a/src/code/win32-pathname.lisp +++ b/src/code/win32-pathname.lisp @@ -20,7 +20,7 @@ (cond ((and (eql c1 #\:) (alpha-char-p c0)) ;; "X:" style, saved as X (values (string (char namestr start)) (+ start 2))) - ((and (member c0 '(#\/ #\\)) (eql c0 c1)) + ((and (member c0 '(#\/ #\\)) (eql c0 c1) (>= end (+ start 3))) ;; "//UNC" style, saved as UNC ;; FIXME: at unparsing time we tell these apart by length, ;; which seems a bit lossy -- presumably one-letter UNC @@ -39,6 +39,11 @@ (defun split-at-slashes-and-backslashes (namestr start end) (declare (type simple-string namestr) (type index start end)) + ;; FIXME: There is a fundamental brokenness in using the same + ;; character as escape character and directory separator in + ;; non-native pathnames. (PATHNAME-DIRECTORY #P"\\*/") should + ;; probably be (:RELATIVE "*") everywhere, but on Windows it's + ;; (:ABSOLUTE :WILD)! See lp#673625. (let ((absolute (and (/= start end) (or (char= (schar namestr start) #\/) (char= (schar namestr start) #\\))))) @@ -80,38 +85,56 @@ name))) (when position (error 'namestring-parse-error - :complaint "can't embed #\\Nul or #\\/ in Unix namestring" + :complaint "can't embed #\\Nul or #\\/ in Windows namestring" :namestring namestring :offset position)))) - ;; Now we have everything we want. So return it. - (values nil ; no host for Win32 namestrings - device - (collect ((dirs)) - (dolist (piece pieces) - (let ((piece-start (car piece)) - (piece-end (cdr piece))) - (unless (= piece-start piece-end) - (cond ((string= namestring ".." - :start1 piece-start - :end1 piece-end) - (dirs :up)) - ((string= namestring "**" - :start1 piece-start - :end1 piece-end) - (dirs :wild-inferiors)) - (t - (dirs (maybe-make-pattern namestring - piece-start - piece-end))))))) - (cond (absolute - (cons :absolute (dirs))) - ((dirs) - (cons :relative (dirs))) - (t - nil))) - name - type - version))))) + + (let (home) + ;; Deal with ~ and ~user. + (when (car pieces) + (destructuring-bind (start . end) (car pieces) + (when (and (not absolute) + (not (eql start end)) + (string= namestring "~" + :start1 start + :end1 (1+ start))) + (setf absolute t) + (if (> end (1+ start)) + (setf home (list :home (subseq namestring (1+ start) end))) + (setf home :home)) + (pop pieces)))) + + ;; Now we have everything we want. So return it. + (values nil ; no host for Win32 namestrings + device + (collect ((dirs)) + (dolist (piece pieces) + (let ((piece-start (car piece)) + (piece-end (cdr piece))) + (unless (= piece-start piece-end) + (cond ((string= namestring ".." + :start1 piece-start + :end1 piece-end) + (dirs :up)) + ((string= namestring "**" + :start1 piece-start + :end1 piece-end) + (dirs :wild-inferiors)) + (t + (dirs (maybe-make-pattern namestring + piece-start + piece-end))))))) + (cond (absolute + (if home + (list* :absolute home (dirs)) + (cons :absolute (dirs)))) + ((dirs) + (cons :relative (dirs))) + (t + nil))) + name + type + version)))))) (defun parse-native-win32-namestring (namestring start end as-directory) (declare (type simple-string namestring) @@ -159,7 +182,7 @@ ;; FIXME: same as UNPARSE-UNIX-HOST. That's probably not good. "") -(defun unparse-win32-device (pathname) +(defun unparse-win32-device (pathname &optional native) (declare (type pathname pathname)) (let ((device (pathname-device pathname)) (directory (pathname-directory pathname))) @@ -170,36 +193,9 @@ ((and (consp directory) (eq :relative (car directory))) (error "No printed representation for a relative UNC pathname.")) (t - (concatenate 'simple-string "\\\\" device))))) - -(defun unparse-win32-directory-list (directory) - (declare (type list directory)) - (collect ((pieces)) - (when directory - (ecase (pop directory) - (:absolute - (pieces "\\")) - (:relative - ;; nothing special - )) - (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)))) - -(defun unparse-win32-directory (pathname) - (declare (type pathname pathname)) - (unparse-win32-directory-list (%pathname-directory pathname))) + (if native + (concatenate 'simple-string "\\\\" device) + (concatenate 'simple-string "//" device)))))) (defun unparse-win32-file (pathname) (declare (type pathname pathname)) @@ -234,7 +230,7 @@ (declare (type pathname pathname)) (concatenate 'simple-string (unparse-win32-device pathname) - (unparse-win32-directory pathname) + (unparse-physical-directory pathname) (unparse-win32-file pathname))) (defun unparse-native-win32-namestring (pathname as-file) @@ -252,12 +248,23 @@ (coerce (with-output-to-string (s) (when device - (write-string (unparse-win32-device pathname) s)) + (write-string (unparse-win32-device pathname t) s)) (when directory - (ecase (car directory) - (:absolute (write-char #\\ s)) + (ecase (pop directory) + (:absolute + (let ((next (pop directory))) + (cond ((eq :home next) + (write-string (user-homedir-namestring) s)) + ((and (consp next) (eq :home (car next))) + (let ((where (user-homedir-namestring (second next)))) + (if where + (write-string where s) + (error "User homedir unknown for: ~S" (second next))))) + (next + (push next directory))) + (write-char #\\ s))) (:relative))) - (loop for (piece . subdirs) on (cdr directory) + (loop for (piece . subdirs) on directory do (typecase piece ((member :up) (write-string ".." s)) (string (write-string piece s)) @@ -311,7 +318,7 @@ pathname-directory) (t (bug "Bad fallthrough in ~S" 'unparse-unix-enough))))) - (strings (unparse-unix-directory-list result-directory))) + (strings (unparse-physical-directory-list result-directory))) (let* ((pathname-type (%pathname-type pathname)) (type-needed (and pathname-type (not (eq pathname-type :unspecific))))