X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fwin32-pathname.lisp;h=a982f68e1cd11f2c3ea9213b2cd064a99d1b1b84;hb=65b5ab7e713d04e0d76bc0ee196374f6e57b922f;hp=08cad05ecc138f53ff46751f8ed9a8525b1a56d3;hpb=37269471524c0e29b17aa073f5130ba592f100b4;p=sbcl.git diff --git a/src/code/win32-pathname.lisp b/src/code/win32-pathname.lisp index 08cad05..a982f68 100644 --- a/src/code/win32-pathname.lisp +++ b/src/code/win32-pathname.lisp @@ -14,10 +14,26 @@ (defun extract-device (namestr start end) (declare (type simple-string namestr) (type index start end)) - (if (and (>= end (+ start 2)) - (alpha-char-p (char namestr start)) - (eql (char namestr (1+ start)) #\:)) - (values (string (char namestr start)) (+ start 2)) + (if (>= end (+ start 2)) + (let ((c0 (char namestr start)) + (c1 (char namestr (1+ start)))) + (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) (>= 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 + ;; hosts can exist as well. That seems a less troublesome + ;; restriction than disallowing UNC hosts whose names match + ;; logical pathname hosts... Time will tell -- both LispWorks + ;; and ACL use the host component for UNC hosts, so maybe + ;; we will end up there as well. + (let ((p (or (position c0 namestr :start (+ start 3) :end end) + end))) + (values (subseq namestr (+ start 2) p) p))) + (t + (values nil start)))) (values nil start))) (defun split-at-slashes-and-backslashes (namestr start end) @@ -31,14 +47,14 @@ ;; Next, split the remainder into slash-separated chunks. (collect ((pieces)) (loop - (let ((slash (position-if (lambda (c) - (or (char= c #\/) - (char= c #\\))) - namestr :start start :end end))) - (pieces (cons start (or slash end))) - (unless slash - (return)) - (setf start (1+ slash)))) + (let ((slash (position-if (lambda (c) + (or (char= c #\/) + (char= c #\\))) + namestr :start start :end end))) + (pieces (cons start (or slash end))) + (unless slash + (return)) + (setf start (1+ slash)))) (values absolute (pieces))))) (defun parse-win32-namestring (namestring start end) @@ -97,7 +113,7 @@ type version))))) -(defun parse-native-win32-namestring (namestring start end) +(defun parse-native-win32-namestring (namestring start end as-directory) (declare (type simple-string namestring) (type index start end)) (setf namestring (coerce namestring 'simple-string)) @@ -110,22 +126,27 @@ collect (if (and (string= piece "..") rest) :up piece))) + (directory (if (and as-directory + (string/= "" (car (last components)))) + components + (butlast components))) (name-and-type - (let* ((end (first (last components))) - (dot (position #\. end :from-end t))) - ;; FIXME: can we get this dot-interpretation knowledge - ;; from existing code? EXTRACT-NAME-TYPE-AND-VERSION - ;; does slightly more work than that. - (cond - ((string= end "") - (list nil nil)) - ((and dot (> dot 0)) - (list (subseq end 0 dot) (subseq end (1+ dot)))) - (t - (list end nil)))))) + (unless as-directory + (let* ((end (first (last components))) + (dot (position #\. end :from-end t))) + ;; FIXME: can we get this dot-interpretation knowledge + ;; from existing code? EXTRACT-NAME-TYPE-AND-VERSION + ;; does slightly more work than that. + (cond + ((string= end "") + (list nil nil)) + ((and dot (> dot 0)) + (list (subseq end 0 dot) (subseq end (1+ dot)))) + (t + (list end nil))))))) (values nil device - (cons (if absolute :absolute :relative) (butlast components)) + (cons (if absolute :absolute :relative) directory) (first name-and-type) (second name-and-type) nil))))) @@ -140,55 +161,16 @@ (defun unparse-win32-device (pathname) (declare (type pathname pathname)) - (let ((device (pathname-device pathname))) - (if (or (null device) (eq device :unspecific)) - "" - (concatenate 'simple-string (string device) ":")))) - -(defun unparse-win32-piece (thing) - (etypecase thing - ((member :wild) "*") - (simple-string - (let* ((srclen (length thing)) - (dstlen srclen)) - (dotimes (i srclen) - (case (schar thing i) - ((#\* #\? #\[) - (incf dstlen)))) - (let ((result (make-string dstlen)) - (dst 0)) - (dotimes (src srclen) - (let ((char (schar thing src))) - (case char - ((#\* #\? #\[) - (setf (schar result dst) #\\) - (incf dst))) - (setf (schar result dst) char) - (incf dst))) - result))) - (pattern - (collect ((strings)) - (dolist (piece (pattern-pieces thing)) - (etypecase piece - (simple-string - (strings piece)) - (symbol - (ecase piece - (:multi-char-wild - (strings "*")) - (:single-char-wild - (strings "?")))) - (cons - (case (car piece) - (:character-set - (strings "[") - (strings (cdr piece)) - (strings "]")) - (t - (error "invalid pattern piece: ~S" piece)))))) - (apply #'concatenate - 'simple-string - (strings)))))) + (let ((device (pathname-device pathname)) + (directory (pathname-directory pathname))) + (cond ((or (null device) (eq device :unspecific)) + "") + ((and (= 1 (length device)) (alpha-char-p (char device 0))) + (concatenate 'simple-string device ":")) + ((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)) @@ -209,7 +191,7 @@ ((member :wild-inferiors) (pieces "**\\")) ((or simple-string pattern (member :wild)) - (pieces (unparse-unix-piece dir)) + (pieces (unparse-physical-piece dir)) (pieces "\\")) (t (error "invalid directory component: ~S" dir))))) @@ -237,7 +219,7 @@ (when (and (typep name 'string) (string= name "")) (error "name is of length 0: ~S" pathname)) - (strings (unparse-unix-piece name))) + (strings (unparse-physical-piece name))) (when type-supplied (unless name (error "cannot specify the type without a file: ~S" pathname)) @@ -245,7 +227,7 @@ (when (position #\. type) (error "type component can't have a #\. inside: ~S" pathname))) (strings ".") - (strings (unparse-unix-piece type)))) + (strings (unparse-physical-piece type)))) (apply #'concatenate 'simple-string (strings)))) (defun unparse-win32-namestring (pathname) @@ -255,42 +237,51 @@ (unparse-win32-directory pathname) (unparse-win32-file pathname))) -(defun unparse-native-win32-namestring (pathname) +(defun unparse-native-win32-namestring (pathname as-file) (declare (type pathname pathname)) - (let ((device (pathname-device pathname)) - (directory (pathname-directory pathname)) - (name (pathname-name pathname)) - (type (pathname-type pathname))) + (let* ((device (pathname-device pathname)) + (directory (pathname-directory pathname)) + (name (pathname-name pathname)) + (name-present-p (typep name '(not (member nil :unspecific)))) + (name-string (if name-present-p name "")) + (type (pathname-type pathname)) + (type-present-p (typep type '(not (member nil :unspecific)))) + (type-string (if type-present-p type ""))) + (when name-present-p + (setf as-file nil)) (coerce (with-output-to-string (s) (when device - (write-string device s) - (write-char #\: s)) - (tagbody - (ecase (pop directory) - (:absolute (write-char #\\ s)) - (:relative)) - (unless directory (go :done)) - :subdir - (let ((piece (pop directory))) - (typecase piece - ((member :up) (write-string ".." s)) - (string (write-string piece s)) - (t (error "ungood piece in NATIVE-NAMESTRING: ~S" piece)))) - (when directory - (write-char #\\ s) - (go :subdir)) - :done) - (when name - (unless (stringp name) - (error "non-STRING name in NATIVE-NAMESTRING: ~S" name)) - (write-char #\\ s) - (write-string name s) - (when type - (unless (stringp type) - (error "non-STRING type in NATIVE-NAMESTRING: ~S" name)) - (write-char #\. s) - (write-string type s)))) + (write-string (unparse-win32-device pathname) s)) + (when directory + (ecase (car directory) + (:absolute (write-char #\\ s)) + (:relative))) + (loop for (piece . subdirs) on (cdr directory) + do (typecase piece + ((member :up) (write-string ".." s)) + (string (write-string piece s)) + (t (error "ungood directory segment in NATIVE-NAMESTRING: ~S" + piece))) + if (or subdirs (stringp name)) + do (write-char #\\ s) + else + do (unless as-file + (write-char #\\ s))) + (if name-present-p + (progn + (unless (stringp name-string) ;some kind of wild field + (error "ungood name component in NATIVE-NAMESTRING: ~S" name)) + (write-string name-string s) + (when type-present-p + (unless (stringp type-string) ;some kind of wild field + (error "ungood type component in NATIVE-NAMESTRING: ~S" type)) + (write-char #\. s) + (write-string type-string s))) + (when type-present-p ; + (error + "type component without a name component in NATIVE-NAMESTRING: ~S" + type)))) 'simple-string))) ;;; FIXME. @@ -307,7 +298,7 @@ (cond ((null pathname-directory) '(:relative)) ((eq (car pathname-directory) :relative) pathname-directory) - ((and (> prefix-len 1) + ((and (> prefix-len 0) (>= (length pathname-directory) prefix-len) (compare-component (subseq pathname-directory 0 prefix-len) @@ -336,7 +327,7 @@ (typep pathname-name 'simple-string) (position #\. pathname-name :start 1)) (error "too many dots in the name: ~S" pathname)) - (strings (unparse-unix-piece pathname-name))) + (strings (unparse-physical-piece pathname-name))) (when type-needed (when (or (null pathname-type) (eq pathname-type :unspecific)) (lose)) @@ -344,5 +335,95 @@ (when (position #\. pathname-type) (error "type component can't have a #\. inside: ~S" pathname))) (strings ".") - (strings (unparse-unix-piece pathname-type)))) + (strings (unparse-physical-piece pathname-type)))) (apply #'concatenate 'simple-string (strings))))) + +;; FIXME: This has been converted rather blindly from the Unix +;; version, with no reference to any Windows docs what so ever. +(defun simplify-win32-namestring (src) + (declare (type simple-string src)) + (let* ((src-len (length src)) + (dst (make-string src-len :element-type 'character)) + (dst-len 0) + (dots 0) + (last-slash nil)) + (flet ((deposit (char) + (setf (schar dst dst-len) char) + (incf dst-len)) + (slashp (char) + (find char "\\/"))) + (dotimes (src-index src-len) + (let ((char (schar src src-index))) + (cond ((char= char #\.) + (when dots + (incf dots)) + (deposit char)) + ((slashp char) + (case dots + (0 + ;; either ``/...' or ``...//...' + (unless last-slash + (setf last-slash dst-len) + (deposit char))) + (1 + ;; either ``./...'' or ``..././...'' + (decf dst-len)) + (2 + ;; We've found .. + (cond + ((and last-slash (not (zerop last-slash))) + ;; There is something before this .. + (let ((prev-prev-slash + (position-if #'slashp dst :end last-slash :from-end t))) + (cond ((and (= (+ (or prev-prev-slash 0) 2) + last-slash) + (char= (schar dst (- last-slash 2)) #\.) + (char= (schar dst (1- last-slash)) #\.)) + ;; The something before this .. is another .. + (deposit char) + (setf last-slash dst-len)) + (t + ;; The something is some directory or other. + (setf dst-len + (if prev-prev-slash + (1+ prev-prev-slash) + 0)) + (setf last-slash prev-prev-slash))))) + (t + ;; There is nothing before this .., so we need to keep it + (setf last-slash dst-len) + (deposit char)))) + (t + ;; something other than a dot between slashes + (setf last-slash dst-len) + (deposit char))) + (setf dots 0)) + (t + (setf dots nil) + (setf (schar dst dst-len) char) + (incf dst-len))))) + ;; ...finish off + (when (and last-slash (not (zerop last-slash))) + (case dots + (1 + ;; We've got ``foobar/.'' + (decf dst-len)) + (2 + ;; We've got ``foobar/..'' + (unless (and (>= last-slash 2) + (char= (schar dst (1- last-slash)) #\.) + (char= (schar dst (- last-slash 2)) #\.) + (or (= last-slash 2) + (slashp (schar dst (- last-slash 3))))) + (let ((prev-prev-slash + (position-if #'slashp dst :end last-slash :from-end t))) + (if prev-prev-slash + (setf dst-len (1+ prev-prev-slash)) + (return-from simplify-win32-namestring + (coerce ".\\" 'simple-string))))))))) + (cond ((zerop dst-len) + ".\\") + ((= dst-len src-len) + dst) + (t + (subseq dst 0 dst-len)))))