Skip to content
Snippets Groups Projects
Commit 83b58cdf authored by ram's avatar ram
Browse files

Fixed enumerate-files to hack :wild and :unspecific name&type.

parent 63b672d4
No related branches found
No related tags found
No related merge requests found
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;; ;;;
(ext:file-comment (ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/filesys.lisp,v 1.32 1993/08/03 13:27:11 ram Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/filesys.lisp,v 1.33 1993/08/03 13:57:35 ram Exp $")
;;; ;;;
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
...@@ -561,13 +561,14 @@ ...@@ -561,13 +561,14 @@
(let ((name (pathname-name pathname)) (let ((name (pathname-name pathname))
(type (pathname-type pathname)) (type (pathname-type pathname))
(version (pathname-version pathname))) (version (pathname-version pathname)))
(cond ((null name) (cond ((member name '(nil :unspecific))
(when (or (not verify-existance) (when (or (not verify-existance)
(unix:unix-file-kind directory)) (unix:unix-file-kind directory))
(funcall function directory))) (funcall function directory)))
((or (pattern-p name) ((or (pattern-p name)
(pattern-p type) (pattern-p type)
(eq version :wild)) (eq name :wild)
(eq type :wild))
(let ((dir (unix:open-dir directory))) (let ((dir (unix:open-dir directory)))
(when dir (when dir
(unwind-protect (unwind-protect
...@@ -595,7 +596,7 @@ ...@@ -595,7 +596,7 @@
(let ((file (concatenate 'string directory name))) (let ((file (concatenate 'string directory name)))
(unless (or (null type) (eq type :unspecific)) (unless (or (null type) (eq type :unspecific))
(setf file (concatenate 'string file "." type))) (setf file (concatenate 'string file "." type)))
(unless (member version '(nil :newest :wild)) (unless (member version '(nil :newest :wild))
(setf file (concatenate 'string file "." (setf file (concatenate 'string file "."
(quick-integer-to-string version)))) (quick-integer-to-string version))))
(when (or (not verify-existance) (when (or (not verify-existance)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment