From 858cf166a9cf7c57ba4858df7ddca92ee038c761 Mon Sep 17 00:00:00 2001 From: Juan Jose Garcia Ripoll Date: Thu, 17 Dec 2009 23:02:57 +0100 Subject: [PATCH] DIRECTORY used stat() also on files that did not match the directory masks. --- src/CHANGELOG | 7 +++++++ src/c/unixfsys.d | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 1b10ece87..e6682ac04 100755 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,10 @@ +ECL 9.12.4: +=========== + +* Bugs fixed: + + - DIRECTORY used stat() also on files that did not match the directory masks. + ECL 9.12.3: =========== diff --git a/src/c/unixfsys.d b/src/c/unixfsys.d index 064007511..5e3a9a7a9 100644 --- a/src/c/unixfsys.d +++ b/src/c/unixfsys.d @@ -746,10 +746,10 @@ list_current_directory(const char *mask, bool only_dir, cl_object prefix) (text[1] == '\0' || (text[1] == '.' && text[2] == '\0'))) continue; - if (only_dir && file_kind(text, TRUE) != @':directory') - continue; if (mask && !string_match(text, mask)) continue; + if (only_dir && file_kind(text, TRUE) != @':directory') + continue; out = ecl_cons(make_base_string_copy(text), out); } #ifdef HAVE_DIRENT_H