suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix redundant exists check and error-reporting problemss in directory-list

Browse Source 
svn: r6038
This commit is contained in:
Matthew Flatt 2007-04-25 06:03:03 +00:00
parent 7c0ea5b79c
commit eeb65e6e53
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/mzscheme/src/file.c
View File

@ -4620,14 +4620,6 @@ static Scheme_Object *do_directory_list(int break_ok, int argc, Scheme_Object *a
} }
} }
if (filename && !scheme_directory_exists(filename)) {
if (break_ok)
scheme_raise_exn(MZEXN_FAIL_FILESYSTEM,
"directory-list: could not open \"%q\"",
filename);
return NULL;
}
# ifdef USE_FINDFIRST # ifdef USE_FINDFIRST
if (!filename) if (!filename)
@ -4671,11 +4663,14 @@ static Scheme_Object *do_directory_list(int break_ok, int argc, Scheme_Object *a
hfile = FIND_FIRST(WIDE_PATH(pattern), &info); hfile = FIND_FIRST(WIDE_PATH(pattern), &info);
if (FIND_FAILED(hfile)) { if (FIND_FAILED(hfile)) {
if (!filename)
return scheme_null;
if (break_ok)
scheme_raise_exn(MZEXN_FAIL_FILESYSTEM, scheme_raise_exn(MZEXN_FAIL_FILESYSTEM,
"directory-list: could not open \"%q\" (%E)", "directory-list: could not open \"%q\" (%E)",
filename, filename,
GetLastError()); GetLastError());
return scheme_null; return NULL;
} }
do { do {
@ -4711,8 +4706,16 @@ static Scheme_Object *do_directory_list(int break_ok, int argc, Scheme_Object *a
# else # else
dir = opendir(filename ? filename : "."); dir = opendir(filename ? filename : ".");
if (!dir) if (!dir) {
if (!filename)
return scheme_null; return scheme_null;
if (break_ok)
scheme_raise_exn(MZEXN_FAIL_FILESYSTEM,
"directory-list: could not open \"%q\" (%e)",
filename,
errno);
return NULL;
}
while ((e = readdir(dir))) { while ((e = readdir(dir))) {
# ifdef DIRENT_NO_NAMLEN # ifdef DIRENT_NO_NAMLEN