X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ffilesys.lisp;h=4569837fe7bb58be52cae5296b99f39475e8d2fc;hb=863d1c0c3314d9002e511e9f98c00d9f0f9bfa78;hp=fd673756a74bfbd4edbabc53f65ba497921c9260;hpb=993d5b779638756473181dda8d928d33038d4cc3;p=sbcl.git diff --git a/src/code/filesys.lisp b/src/code/filesys.lisp index fd67375..4569837 100644 --- a/src/code/filesys.lisp +++ b/src/code/filesys.lisp @@ -16,14 +16,11 @@ ;;; Unix namestrings have the following format: ;;; ;;; namestring := [ directory ] [ file [ type [ version ]]] -;;; directory := [ "/" | search-list ] { file "/" }* -;;; search-list := [^:/]*: +;;; directory := [ "/" ] { file "/" }* ;;; file := [^/]* ;;; type := "." [^/.]* ;;; version := "." ([0-9]+ | "*") ;;; -;;; FIXME: Search lists are no longer supported. -;;; ;;; Note: this grammar is ambiguous. The string foo.bar.5 can be ;;; parsed as either just the file specified or as specifying the ;;; file, type, and version. Therefore, we use the following rules @@ -218,7 +215,17 @@ (setf start (1+ slash)))) (values absolute (pieces))))) -(defun maybe-extract-search-list (namestr start end) +;;; the thing before a colon in a logical path +(def!struct (logical-hostname (:make-load-form-fun + (lambda (x) + (values `(make-logical-hostname + ,(logical-hostname-name x)) + nil))) + (:copier nil) + (:constructor make-logical-hostname (name))) + (name (missing-arg) :type simple-string)) + +(defun maybe-extract-logical-hostname (namestr start end) (declare (type simple-base-string namestr) (type index start end)) (let ((quoted nil)) @@ -231,69 +238,77 @@ (#\\ (setf quoted t)) (#\: - (return (values (remove-backslashes namestr start index) + (return (values (make-logical-hostname + (remove-backslashes namestr start index)) (1+ index))))))))) (defun parse-unix-namestring (namestr start end) (declare (type simple-base-string namestr) - (type index start end)) + (type index start end)) (multiple-value-bind (absolute pieces) (split-at-slashes namestr start end) - (let ((search-list (if absolute - nil - (let ((first (car pieces))) - (multiple-value-bind (search-list new-start) - (maybe-extract-search-list namestr - (car first) - (cdr first)) - (when search-list - (setf absolute t) - (setf (car first) new-start)) - search-list))))) + (let ((logical-hostname + (if absolute + nil + (let ((first (car pieces))) + (multiple-value-bind (logical-hostname new-start) + (maybe-extract-logical-hostname namestr + (car first) + (cdr first)) + (when logical-hostname + (setf absolute t) + (setf (car first) new-start)) + logical-hostname))))) + (declare (type (or null logical-hostname) logical-hostname)) (multiple-value-bind (name type version) - (let* ((tail (car (last pieces))) - (tail-start (car tail)) - (tail-end (cdr tail))) - (unless (= tail-start tail-end) - (setf pieces (butlast pieces)) - (extract-name-type-and-version namestr tail-start tail-end))) - ;; PVE: make sure there are no illegal characters in - ;; the name, illegal being (code-char 0) and #\/ - #!+high-security - (when (and (stringp name) - (find-if #'(lambda (x) (or (char= x (code-char 0)) - (char= x #\/))) - name)) - (error 'parse-error)) - - ;; Now we have everything we want. So return it. - (values nil ; no host for unix namestrings. - nil ; no devices for unix namestrings. - (collect ((dirs)) - (when search-list - (dirs (intern-search-list search-list))) - (dolist (piece pieces) - (let ((piece-start (car piece)) - (piece-end (cdr piece))) - (unless (= piece-start piece-end) - (cond ((string= namestr ".." :start1 piece-start - :end1 piece-end) - (dirs :up)) - ((string= namestr "**" :start1 piece-start - :end1 piece-end) - (dirs :wild-inferiors)) - (t - (dirs (maybe-make-pattern namestr - piece-start - piece-end))))))) - (cond (absolute - (cons :absolute (dirs))) - ((dirs) - (cons :relative (dirs))) - (t - nil))) - name - type - version))))) + (let* ((tail (car (last pieces))) + (tail-start (car tail)) + (tail-end (cdr tail))) + (unless (= tail-start tail-end) + (setf pieces (butlast pieces)) + (extract-name-type-and-version namestr tail-start tail-end))) + + (when (stringp name) + (let ((position (position-if (lambda (char) + (or (char= char (code-char 0)) + (char= char #\/))) + name))) + (when position + (error 'namestring-parse-error + :complaint "can't embed #\\Nul or #\\/ in Unix namestring" + :namestring namestr + :offset position)))) + + ;; Now we have everything we want. So return it. + (values nil ; no host for Unix namestrings + nil ; no device for Unix namestrings + (collect ((dirs)) + (when logical-hostname + (dirs logical-hostname)) + (dolist (piece pieces) + (let ((piece-start (car piece)) + (piece-end (cdr piece))) + (unless (= piece-start piece-end) + (cond ((string= namestr ".." + :start1 piece-start + :end1 piece-end) + (dirs :up)) + ((string= namestr "**" + :start1 piece-start + :end1 piece-end) + (dirs :wild-inferiors)) + (t + (dirs (maybe-make-pattern namestr + piece-start + piece-end))))))) + (cond (absolute + (cons :absolute (dirs))) + ((dirs) + (cons :relative (dirs))) + (t + nil))) + name + type + version))))) (/show0 "filesys.lisp 300") @@ -353,8 +368,14 @@ (when directory (ecase (pop directory) (:absolute - (cond ((search-list-p (car directory)) - (pieces (search-list-name (pop directory))) + (cond ((logical-hostname-p (car directory)) + ;; FIXME: The old CMU CL "search list" extension is + ;; gone, but the old machinery is still being used + ;; clumsily here and elsewhere, to represent anything + ;; which belongs before a colon prefix in the ANSI + ;; pathname machinery. This should be cleaned up, + ;; using simpler machinery with more mnemonic names. + (pieces (logical-hostname-name (pop directory))) (pieces ":")) (t (pieces "/")))) @@ -385,22 +406,17 @@ (collect ((strings)) (let* ((name (%pathname-name pathname)) (type (%pathname-type pathname)) - (type-supplied (not (or (null type) (eq type :unspecific)))) - (version (%pathname-version pathname)) - (version-supplied (not (or (null version) (eq version :newest))))) + (type-supplied (not (or (null type) (eq type :unspecific))))) + ;; Note: by ANSI 19.3.1.1.5, we ignore the version slot when + ;; translating logical pathnames to a filesystem without + ;; versions (like Unix). (when name (strings (unparse-unix-piece name))) (when type-supplied (unless name (error "cannot specify the type without a file: ~S" pathname)) (strings ".") - (strings (unparse-unix-piece type))) - (when version-supplied - (unless type-supplied - (error "cannot specify the version without a type: ~S" pathname)) - (strings (if (eq version :wild) - ".*" - (format nil ".~D" version))))) + (strings (unparse-unix-piece type)))) (apply #'concatenate 'simple-string (strings)))) (/show0 "filesys.lisp 406") @@ -420,7 +436,7 @@ (let* ((pathname-directory (%pathname-directory pathname)) (defaults-directory (%pathname-directory defaults)) (prefix-len (length defaults-directory)) - (result-dir + (result-directory (cond ((and (> prefix-len 1) (>= (length pathname-directory) prefix-len) (compare-component (subseq pathname-directory @@ -435,7 +451,7 @@ (t ;; We are a relative directory. So we lose. (lose))))) - (strings (unparse-unix-directory-list result-dir))) + (strings (unparse-unix-directory-list result-directory))) (let* ((pathname-version (%pathname-version pathname)) (version-needed (and pathname-version (not (eq pathname-version :newest)))) @@ -466,54 +482,46 @@ (t (lose))))) (apply #'concatenate 'simple-string (strings))))) - -(/show0 "filesys.lisp 471") - -(def!struct (unix-host - (:make-load-form-fun make-unix-host-load-form) - (:include host - (parse #'parse-unix-namestring) - (unparse #'unparse-unix-namestring) - (unparse-host #'unparse-unix-host) - (unparse-directory #'unparse-unix-directory) - (unparse-file #'unparse-unix-file) - (unparse-enough #'unparse-unix-enough) - (customary-case :lower)))) - -(/show0 "filesys.lisp 486") - -(defvar *unix-host* (make-unix-host)) - -(/show0 "filesys.lisp 488") - -(defun make-unix-host-load-form (host) - (declare (ignore host)) - '*unix-host*) ;;;; wildcard matching stuff -(/show0 "filesys.lisp 498") +;;; Return a list of all the Lispy filenames (not including e.g. the +;;; Unix magic "." and "..") in the directory named by DIRECTORY-NAME. +(defun directory-lispy-filenames (directory-name) + (with-alien ((adlf (* c-string) + (alien-funcall (extern-alien + "alloc_directory_lispy_filenames" + (function (* c-string) c-string)) + directory-name))) + (if (null-alien adlf) + (error 'simple-file-error + :pathname directory-name + :format-control "~@" + :format-arguments (list directory-name (strerror))) + (unwind-protect + (c-strings->string-list adlf) + (alien-funcall (extern-alien "free_directory_lispy_filenames" + (function void (* c-string))) + adlf))))) -;;; FIXME: could maybe be EVAL-WHEN (COMPILE EVAL) +(/show0 "filesys.lisp 498") -(defmacro enumerate-matches ((var pathname &optional result - &key (verify-existence t) - (follow-links t)) - &body body) - (let ((body-name (gensym))) - `(block nil - (flet ((,body-name (,var) - ,@body)) - (%enumerate-matches (pathname ,pathname) - ,verify-existence - ,follow-links - #',body-name) - ,result)))) +(defmacro !enumerate-matches ((var pathname &optional result + &key (verify-existence t) + (follow-links t)) + &body body) + `(block nil + (%enumerate-matches (pathname ,pathname) + ,verify-existence + ,follow-links + (lambda (,var) ,@body)) + ,result)) (/show0 "filesys.lisp 500") +;;; Call FUNCTION on matches. (defun %enumerate-matches (pathname verify-existence follow-links function) - (/show0 "entering %ENUMERATE-MATCHES") + (/noshow0 "entering %ENUMERATE-MATCHES") (when (pathname-type pathname) (unless (pathname-name pathname) (error "cannot supply a type without a name:~% ~S" pathname))) @@ -521,21 +529,22 @@ (member (pathname-type pathname) '(nil :unspecific))) (error "cannot supply a version without a type:~% ~S" pathname)) (let ((directory (pathname-directory pathname))) - (/show0 "computed DIRECTORY") + (/noshow0 "computed DIRECTORY") (if directory (ecase (car directory) (:absolute - (/show0 "absolute directory") + (/noshow0 "absolute directory") (%enumerate-directories "/" (cdr directory) pathname verify-existence follow-links nil function)) (:relative - (/show0 "relative directory") + (/noshow0 "relative directory") (%enumerate-directories "" (cdr directory) pathname verify-existence follow-links nil function))) (%enumerate-files "" pathname verify-existence function)))) +;;; Call FUNCTION on directories. (defun %enumerate-directories (head tail pathname verify-existence follow-links nodes function) (declare (simple-string head)) @@ -549,20 +558,7 @@ (when (and res (eql (logand mode sb!unix:s-ifmt) sb!unix:s-ifdir)) (let ((nodes (cons (cons dev ino) nodes))) - ,@body)))) - (do-directory-entries ((name directory) &body body) - `(let ((dir (sb!unix:open-dir ,directory))) - (when dir - (unwind-protect - (loop - (let ((,name (sb!unix:read-dir dir))) - (cond ((null ,name) - (return)) - ((string= ,name ".")) - ((string= ,name "..")) - (t - ,@body)))) - (sb!unix:close-dir dir)))))) + ,@body))))) (if tail (let ((piece (car tail))) (etypecase piece @@ -577,7 +573,7 @@ (%enumerate-directories head (rest tail) pathname verify-existence follow-links nodes function) - (do-directory-entries (name head) + (dolist (name (ignore-errors (directory-lispy-filenames head))) (let ((subdir (concatenate 'string head name))) (multiple-value-bind (res dev ino mode) (unix-xstat subdir) @@ -594,7 +590,7 @@ verify-existence follow-links nodes function)))))))) ((or pattern (member :wild)) - (do-directory-entries (name head) + (dolist (name (directory-lispy-filenames head)) (when (or (eq piece :wild) (pattern-matches piece name)) (let ((subdir (concatenate 'string head name))) (multiple-value-bind (res dev ino mode) @@ -617,15 +613,16 @@ nodes function)))))) (%enumerate-files head pathname verify-existence function)))) +;;; Call FUNCTION on files. (defun %enumerate-files (directory pathname verify-existence function) (declare (simple-string directory)) - (/show0 "entering %ENUMERATE-FILES") + (/noshow0 "entering %ENUMERATE-FILES") (let ((name (%pathname-name pathname)) (type (%pathname-type pathname)) (version (%pathname-version pathname))) - (/show0 "computed NAME, TYPE, and VERSION") + (/noshow0 "computed NAME, TYPE, and VERSION") (cond ((member name '(nil :unspecific)) - (/show0 "UNSPECIFIC, more or less") + (/noshow0 "UNSPECIFIC, more or less") (when (or (not verify-existence) (sb!unix:unix-file-kind directory)) (funcall function directory))) @@ -633,51 +630,46 @@ (pattern-p type) (eq name :wild) (eq type :wild)) - (/show0 "WILD, more or less") - (let ((dir (sb!unix:open-dir directory))) - (when dir - (unwind-protect - (loop - (/show0 "at head of LOOP") - (let ((file (sb!unix:read-dir dir))) - (if file - (unless (or (string= file ".") - (string= file "..")) - (multiple-value-bind - (file-name file-type file-version) - (let ((*ignore-wildcards* t)) - (extract-name-type-and-version - file 0 (length file))) - (when (and (components-match file-name name) - (components-match file-type type) - (components-match file-version - version)) - (funcall function - (concatenate 'string - directory - file))))) - (return)))) - (sb!unix:close-dir dir))))) + (/noshow0 "WILD, more or less") + ;; I IGNORE-ERRORS here just because the original CMU CL + ;; code did. I think the intent is that it's not an error + ;; to request matches to a wild pattern when no matches + ;; exist, but I haven't tried to figure out whether + ;; everything is kosher. (E.g. what if we try to match a + ;; wildcard but we don't have permission to read one of the + ;; relevant directories?) -- WHN 2001-04-17 + (dolist (complete-filename (ignore-errors + (directory-lispy-filenames directory))) + (multiple-value-bind + (file-name file-type file-version) + (let ((*ignore-wildcards* t)) + (extract-name-type-and-version + complete-filename 0 (length complete-filename))) + (when (and (components-match file-name name) + (components-match file-type type) + (components-match file-version version)) + (funcall function + (concatenate 'string + directory + complete-filename)))))) (t - (/show0 "default case") + (/noshow0 "default case") (let ((file (concatenate 'string directory name))) - (/show0 "computed basic FILE=..") - #!+sb-show (%primitive print file) + (/noshow "computed basic FILE") (unless (or (null type) (eq type :unspecific)) - (/show0 "tweaking FILE for more-or-less-:UNSPECIFIC case") + (/noshow0 "tweaking FILE for more-or-less-:UNSPECIFIC case") (setf file (concatenate 'string file "." type))) (unless (member version '(nil :newest :wild)) - (/show0 "tweaking FILE for more-or-less-:WILD case") + (/noshow0 "tweaking FILE for more-or-less-:WILD case") (setf file (concatenate 'string file "." (quick-integer-to-string version)))) - (/show0 "finished possibly tweaking FILE=..") - #!+sb-show (%primitive print file) + (/noshow0 "finished possibly tweaking FILE") (when (or (not verify-existence) (sb!unix:unix-file-kind file t)) - (/show0 "calling FUNCTION on FILE") + (/noshow0 "calling FUNCTION on FILE") (funcall function file))))))) -(/show0 "filesys.lisp 603") +(/noshow0 "filesys.lisp 603") ;;; FIXME: Why do we need this? (defun quick-integer-to-string (n) @@ -706,46 +698,69 @@ ;;;; UNIX-NAMESTRING -(defun unix-namestring (pathname &optional (for-input t) executable-only) - #!+sb-doc - "Convert PATHNAME into a string that can be used with UNIX system calls. - Search-lists and wild-cards are expanded." - ;; toy@rtp.ericsson.se: Let unix-namestring also handle logical - ;; pathnames too. - ;; FIXME: What does this ^ mean? A bug? A remark on a change already made? - (let ((path (let ((lpn (pathname pathname))) - (if (typep lpn 'logical-pathname) - (namestring (translate-logical-pathname lpn)) - pathname)))) - (enumerate-search-list - (pathname path) - (collect ((names)) - (enumerate-matches (name pathname nil :verify-existence for-input) - (when (or (not executable-only) - (and (eq (sb!unix:unix-file-kind name) - :file) - (sb!unix:unix-access name - sb!unix:x_ok))) - (names name))) - (let ((names (names))) - (when names - (when (cdr names) - (error 'simple-file-error - :format-control "~S is ambiguous:~{~% ~A~}" - :format-arguments (list pathname names))) - (return (car names)))))))) +(defun empty-relative-pathname-spec-p (x) + (or (equal x "") + (and (pathnamep x) + (or (equal (pathname-directory x) '(:relative)) + ;; KLUDGE: I'm not sure this second check should really + ;; have to be here. But on sbcl-0.6.12.7, + ;; (PATHNAME-DIRECTORY (PATHNAME "")) is NIL, and + ;; (PATHNAME "") seems to act like an empty relative + ;; pathname, so in order to work with that, I test + ;; for NIL here. -- WHN 2001-05-18 + (null (pathname-directory x))) + (null (pathname-name x)) + (null (pathname-type x))) + ;; (The ANSI definition of "pathname specifier" has + ;; other cases, but none of them seem to admit the possibility + ;; of being empty and relative.) + )) + +;;; Convert PATHNAME into a string that can be used with UNIX system +;;; calls, or return NIL if no match is found. Wild-cards are expanded. +(defun unix-namestring (pathname-spec &optional (for-input t)) + ;; The ordinary rules of converting Lispy paths to Unix paths break + ;; down for the current working directory, which Lisp thinks of as + ;; "" (more or less, and modulo ANSI's *DEFAULT-PATHNAME-DEFAULTS*, + ;; which unfortunately SBCL, as of sbcl-0.6.12.8, basically ignores) + ;; and Unix thinks of as ".". Since we're at the interface between + ;; Unix system calls and things like ENSURE-DIRECTORIES-EXIST which + ;; think the Lisp way, we perform the conversion. + ;; + ;; (FIXME: The *right* way to deal with this special case is to + ;; merge PATHNAME-SPEC with *DEFAULT-PATHNAME-DEFAULTS* here, after + ;; which it's not a relative pathname any more so the special case + ;; is no longer an issue. But until *DEFAULT-PATHNAME-DEFAULTS* + ;; works, we use this hack.) + (if (empty-relative-pathname-spec-p pathname-spec) + "." + ;; Otherwise, the ordinary rules apply. + (let* ((namestring (physicalize-pathname (pathname pathname-spec))) + (matches nil)) ; an accumulator for actual matches + (!enumerate-matches (match namestring nil :verify-existence for-input) + (push match matches)) + (case (length matches) + (0 nil) + (1 (first matches)) + (t (error 'simple-file-error + :format-control "~S is ambiguous:~{~% ~A~}" + :format-arguments (list pathname-spec matches))))))) ;;;; TRUENAME and PROBE-FILE -;;; Another silly file function trivially different from another function. +;;; This is only trivially different from PROBE-FILE, which is silly +;;; but ANSI. (defun truename (pathname) #!+sb-doc - "Return the pathname for the actual file described by the pathname - An error of type file-error is signalled if no such file exists, - or the pathname is wild." + "Return the pathname for the actual file described by PATHNAME. + An error of type FILE-ERROR is signalled if no such file exists, + or the pathname is wild. + + Under Unix, the TRUENAME of a broken symlink is considered to be + the name of the broken symlink itself." (if (wild-pathname-p pathname) (error 'simple-file-error - :format-control "bad place for a wild pathname" + :format-control "can't use a wild pathname here" :pathname pathname) (let ((result (probe-file pathname))) (unless result @@ -758,20 +773,21 @@ ;;; If PATHNAME exists, return its truename, otherwise NIL. (defun probe-file (pathname) #!+sb-doc - "Return a pathname which is the truename of the file if it exists, NIL + "Return a pathname which is the truename of the file if it exists, or NIL otherwise. An error of type FILE-ERROR is signaled if pathname is wild." - (if (wild-pathname-p pathname) - (error 'simple-file-error - :pathname pathname - :format-control "bad place for a wild pathname") - (let ((namestring (unix-namestring pathname t))) - (when (and namestring (sb!unix:unix-file-kind namestring)) - (let ((truename (sb!unix:unix-resolve-links - (sb!unix:unix-maybe-prepend-current-directory - namestring)))) - (when truename - (let ((*ignore-wildcards* t)) - (pathname (sb!unix:unix-simplify-pathname truename))))))))) + (when (wild-pathname-p pathname) + (error 'simple-file-error + :pathname pathname + :format-control "can't use a wild pathname here")) + (let* ((defaulted-pathname (merge-pathnames + pathname + (sane-default-pathname-defaults))) + (namestring (unix-namestring defaulted-pathname t))) + (when (and namestring (sb!unix:unix-file-kind namestring t)) + (let ((trueishname (sb!unix:unix-resolve-links namestring))) + (when trueishname + (let ((*ignore-wildcards* t)) + (pathname (sb!unix:unix-simplify-pathname trueishname)))))))) ;;;; miscellaneous other operations @@ -779,7 +795,7 @@ (defun rename-file (file new-name) #!+sb-doc - "Rename File to have the specified New-Name. If file is a stream open to a + "Rename FILE to have the specified NEW-NAME. If FILE is a stream open to a file, then the associated file is renamed." (let* ((original (truename file)) (original-namestring (unix-namestring original t)) @@ -795,16 +811,16 @@ (unless res (error 'simple-file-error :pathname new-name - :format-control "failed to rename ~A to ~A: ~A" - :format-arguments (list original new-name - (sb!unix:get-unix-error-msg error)))) + :format-control "~@" + :format-arguments (list original new-name (strerror error)))) (when (streamp file) (file-name file new-namestring)) (values new-name original (truename new-name))))) (defun delete-file (file) #!+sb-doc - "Delete the specified file." + "Delete the specified FILE." (let ((namestring (unix-namestring file t))) (when (streamp file) (close file :abort t)) @@ -813,21 +829,17 @@ :pathname file :format-control "~S doesn't exist." :format-arguments (list file))) - (multiple-value-bind (res err) (sb!unix:unix-unlink namestring) (unless res - (error 'simple-file-error - :pathname namestring - :format-control "could not delete ~A: ~A" - :format-arguments (list namestring - (sb!unix:get-unix-error-msg err)))))) + (simple-file-perror "couldn't delete ~A" namestring err)))) t) -;;; Return Home:, which is set up for us at initialization time. +;;; (This is an ANSI Common Lisp function.) +;;; +;;; This is obtained from the logical name \"home:\", which is set +;;; up for us at initialization time. (defun user-homedir-pathname (&optional host) - #!+sb-doc - "Returns the home directory of the logged in user as a pathname. - This is obtained from the logical name \"home:\"." + "Return the home directory of the user as a pathname." (declare (ignore host)) ;; Note: CMU CL did #P"home:" here instead of using a call to ;; PATHNAME. Delaying construction of the pathname until we're @@ -863,9 +875,9 @@ (defun file-author (file) #!+sb-doc - "Returns the file author as a string, or nil if the author cannot be - determined. Signals an error of type file-error if file doesn't exist, - or file is a wild pathname." + "Return the file author as a string, or nil if the author cannot be + determined. Signal an error of type FILE-ERROR if FILE doesn't exist, + or FILE is a wild pathname." (if (wild-pathname-p file) (error 'simple-file-error :pathname file @@ -885,38 +897,40 @@ (/show0 "filesys.lisp 800") -(defun directory (pathname &key (all t) (check-for-subdirs t) - (follow-links t)) +(defun directory (pathname &key) #!+sb-doc - "Returns a list of pathnames, one for each file that matches the given - pathname. Supplying :ALL as NIL causes this to ignore Unix dot files. This - never includes Unix dot and dot-dot in the result. If :FOLLOW-LINKS is NIL, - then symbolic links in the result are not expanded. This is not the - default because TRUENAME does follow links, and the result pathnames are - defined to be the TRUENAME of the pathname (the truename of a link may well - be in another directory.)" - (let ((results nil)) - (enumerate-search-list - (pathname (merge-pathnames pathname - (make-pathname :name :wild - :type :wild - :version :wild))) - (enumerate-matches (name pathname) - (when (or all - (let ((slash (position #\/ name :from-end t))) - (or (null slash) - (= (1+ slash) (length name)) - (char/= (schar name (1+ slash)) #\.)))) - (push name results)))) - (let ((*ignore-wildcards* t)) - (mapcar (lambda (name) - (let ((name (if (and check-for-subdirs - (eq (sb!unix:unix-file-kind name) - :directory)) - (concatenate 'string name "/") - name))) - (if follow-links (truename name) (pathname name)))) - (sort (delete-duplicates results :test #'string=) #'string<))))) + "Return a list of PATHNAMEs, each the TRUENAME of a file that matched the + given pathname. Note that the interaction between this ANSI-specified + TRUENAMEing and the semantics of the Unix filesystem (symbolic links..) + means this function can sometimes return files which don't have the same + directory as PATHNAME." + (let (;; We create one entry in this hash table for each truename, + ;; as an asymptotically fast way of removing duplicates (which + ;; can arise when e.g. multiple symlinks map to the same + ;; truename). + (truenames (make-hash-table :test #'equal)) + (merged-pathname (merge-pathnames pathname + (make-pathname :name :wild + :type :wild + :version :wild)))) + (!enumerate-matches (match merged-pathname) + (let ((*ignore-wildcards* t) + (truename (truename (if (eq (sb!unix:unix-file-kind match) + :directory) + (concatenate 'string match "/") + match)))) + (setf (gethash (namestring truename) truenames) + truename))) + (mapcar #'cdr + ;; Sorting isn't required by the ANSI spec, but sorting + ;; into some canonical order seems good just on the + ;; grounds that the implementation should have repeatable + ;; behavior when possible. + (sort (loop for name being each hash-key in truenames + using (hash-value truename) + collect (cons name truename)) + #'string< + :key #'car)))) ;;;; translating Unix uid's ;;;; @@ -946,13 +960,13 @@ ;;; Then if necessary, we look in "/etc/passwds" ("/etc/groups") which ;;; is really long and has to be fetched over the net. ;;; +;;; The result is a SIMPLE-STRING or NIL. +;;; ;;; FIXME: Now that we no longer have lookup-group-name, we no longer need ;;; the GROUP-OR-USER argument. (defun get-group-or-user-name (group-or-user id) - #!+sb-doc - "Returns the simple-string user or group name of the user whose uid or gid - is id, or NIL if no such user or group exists. Group-or-user is either - :group or :user." + (declare (type (member :group :user) group-or-user)) + (declare (type index id)) (let ((id-string (let ((*print-base* 10)) (prin1-to-string id)))) (declare (simple-string id-string)) (multiple-value-bind (file1 file2) @@ -985,7 +999,7 @@ (/show0 "filesys.lisp 899") -;;; Predicate to order pathnames by. Goes by name. +;;; predicate to order pathnames by; goes by name (defun pathname-order (x y) (let ((xn (%pathname-name x)) (yn (%pathname-name y))) @@ -997,70 +1011,37 @@ (t t))) xn))) -(defun default-directory () - #!+sb-doc - "Returns the pathname for the default directory. This is the place where - a file will be written if no directory is specified. This may be changed - with setf." - (multiple-value-bind (gr dir-or-error) (sb!unix:unix-current-directory) - (if gr - (let ((*ignore-wildcards* t)) - (pathname (concatenate 'simple-string dir-or-error "/"))) - (error dir-or-error)))) - -(defun %set-default-directory (new-val) - (let ((namestring (unix-namestring new-val t))) - (unless namestring - (error "~S doesn't exist." new-val)) - (multiple-value-bind (gr error) (sb!unix:unix-chdir namestring) - (if gr - (setf (search-list "default:") (default-directory)) - (error (sb!unix:get-unix-error-msg error)))) - new-val)) - -(/show0 "filesys.lisp 934") - -(/show0 "entering what used to be !FILESYS-COLD-INIT") -(defvar *default-pathname-defaults* - (%make-pathname *unix-host* nil nil nil nil :newest)) -(setf (search-list "default:") (default-directory)) -(/show0 "leaving what used to be !FILESYS-COLD-INIT") - (defun ensure-directories-exist (pathspec &key verbose (mode #o777)) #!+sb-doc - "Tests whether the directories containing the specified file - actually exist, and attempts to create them if they do not. - Portable programs should avoid using the :MODE keyword argument." - (let* ((pathname (pathname pathspec)) - (pathname (if (typep pathname 'logical-pathname) - (translate-logical-pathname pathname) - pathname)) - (created-p nil)) + "Test whether the directories containing the specified file + actually exist, and attempt to create them if they do not. + The MODE argument is a CMUCL/SBCL-specific extension to control + the Unix permission bits." + (let ((pathname (physicalize-pathname (pathname pathspec))) + (created-p nil)) (when (wild-pathname-p pathname) (error 'simple-file-error :format-control "bad place for a wild pathname" :pathname pathspec)) - (enumerate-search-list (pathname pathname) - (let ((dir (pathname-directory pathname))) - (loop for i from 1 upto (length dir) - do (let ((newpath (make-pathname - :host (pathname-host pathname) - :device (pathname-device pathname) - :directory (subseq dir 0 i)))) - (unless (probe-file newpath) - (let ((namestring (namestring newpath))) - (when verbose - (format *standard-output* - "~&creating directory: ~A~%" - namestring)) - (sb!unix:unix-mkdir namestring mode) - (unless (probe-file namestring) - (error 'simple-file-error - :pathname pathspec - :format-control "can't create directory ~A" - :format-arguments (list namestring))) - (setf created-p t))))) - ;; Only the first path in a search-list is considered. - (return (values pathname created-p)))))) + (let ((dir (pathname-directory pathname))) + (loop for i from 1 upto (length dir) + do (let ((newpath (make-pathname + :host (pathname-host pathname) + :device (pathname-device pathname) + :directory (subseq dir 0 i)))) + (unless (probe-file newpath) + (let ((namestring (namestring newpath))) + (when verbose + (format *standard-output* + "~&creating directory: ~A~%" + namestring)) + (sb!unix:unix-mkdir namestring mode) + (unless (probe-file namestring) + (error 'simple-file-error + :pathname pathspec + :format-control "can't create directory ~A" + :format-arguments (list namestring))) + (setf created-p t))))) + (values pathname created-p)))) (/show0 "filesys.lisp 1000")