Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
asdf
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jan Moringen
asdf
Commits
1ebfcdcc
Commit
1ebfcdcc
authored
11 years ago
by
Robert P. Goldman
Browse files
Options
Downloads
Patches
Plain Diff
Fix for bug where DIRECTORY-FILES listed subdirectories.
parent
fad76d08
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
uiop/filesystem.lisp
+17
-9
17 additions, 9 deletions
uiop/filesystem.lisp
with
17 additions
and
9 deletions
uiop/filesystem.lisp
+
17
−
9
View file @
1ebfcdcc
...
...
@@ -142,6 +142,9 @@ or the original (parsed) pathname if it is false (the default)."
(
defun
directory-exists-p
(
x
)
"Is X the name of a directory that exists on the filesystem?"
#+
allegro
(
excl:probe-directory
x
)
#-
allegro
(
let
((
p
(
probe-file*
x
:truename
t
)))
(
and
(
directory-pathname-p
p
)
p
)))
...
...
@@ -187,8 +190,12 @@ This function is used as a helper to DIRECTORY-FILES to avoid invalid entries wh
(
defun
directory-files
(
directory
&optional
(
pattern
*wild-file*
))
"Return a list of the files in a directory according to the PATTERN,
which is not very portable to override. Try not resolve symlinks if implementation allows."
"Return a list of the files in a directory according to the PATTERN.
Subdirectories should NOT be returned.
PATTERN defaults to a pattern carefully chosen based on the implementation;
override the default at your own risk.
DIRECTORY-FILES tries NOT to resolve symlinks if the implementation
permits this."
(
let
((
dir
(
pathname
directory
)))
(
when
(
logical-pathname-p
dir
)
;; Because of the filtering we do below,
...
...
@@ -204,13 +211,14 @@ which is not very portable to override. Try not resolve symlinks if implementati
#+
clisp
(
when
(
equal
:wild
(
pathname-type
pattern
))
(
ignore-errors
(
directory*
(
make-pathname
:type
nil
:defaults
pat
)))))))
(
filter-logical-directory-results
directory
entries
#'
(
lambda
(
f
)
(
make-pathname
:defaults
dir
:name
(
make-pathname-component-logical
(
pathname-name
f
))
:type
(
make-pathname-component-logical
(
pathname-type
f
))
:version
(
make-pathname-component-logical
(
pathname-version
f
))))))))
(
remove-if
'directory-exists-p
(
filter-logical-directory-results
directory
entries
#'
(
lambda
(
f
)
(
make-pathname
:defaults
dir
:name
(
make-pathname-component-logical
(
pathname-name
f
))
:type
(
make-pathname-component-logical
(
pathname-type
f
))
:version
(
make-pathname-component-logical
(
pathname-version
f
)))))))))
(
defun
subdirectories
(
directory
)
"Given a DIRECTORY pathname designator, return a list of the subdirectories under it."
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment