init.sh: don't let an ephemeral "*.exe" make us skip all dir entries

Not that it's likely to happen, but if I were to remove from a PATH
directory a file named "*.exe" (yes, starting with an asterisk),
at just the right moment, it would have made init.sh ignore all
remaining .exe-suffixed names in that directory.

* tests/init.sh (find_exe_basenames_): Don't give up on a directory if
a file named "*.exe" is removed between the glob expansion and the
processing of that oddly named file.

diff --git a/ChangeLog b/ChangeLog
index 9f180a0d03ec61aebb59dd41717fae76756adc15..4caca7c3b5b0bd14f191fa52702166459f09f4b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-18  Jim Meyering  <meyering@redhat.com>
+
+       init.sh: don't let an ephemeral "*.exe" make us skip all dir entries
+       * tests/init.sh (find_exe_basenames_): Don't give up on a directory if
+       a file named "*.exe" is removed between the glob expansion and the
+       processing of that oddly named file.
+
 2010-09-17  Eric Blake  <eblake@redhat.com>
 
        mirbsd: add some more support

diff --git a/tests/init.sh b/tests/init.sh
index d655fbbb60fbf4355dd8b2d693e26174f3dbc019..20357ce9c22ef7fb334d852c75d33239cc754b62 100644 (file)
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -240,9 +240,11 @@ find_exe_basenames_()
   feb_result_=
   feb_sp_=
   for feb_file_ in $feb_dir_/*.exe; do
-    if test "x$feb_file_" = "x$feb_dir_/*.exe" && test ! -f "$feb_file_"; then
-      return 0
-    fi
+    # If there was no *.exe file, or there existed a file named "*.exe" that
+    # was deleted between the above glob expansion and the existence test
+    # below, just skip it.
+    test "x$feb_file_" = "x$feb_dir_/*.exe" && test ! -f "$feb_file_" \
+      && continue
     case $feb_file_ in
       *[!-a-zA-Z/0-9_.+]*) feb_fail_=1; break;;
       *) # Remove leading file name components as well as the .exe suffix.