changeset 13701:c11192d889cf

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.
author Jim Meyering <meyering@redhat.com>
date Sat, 18 Sep 2010 08:33:23 +0200
parents 64110b464ca2
children 7f83788c7dab
files ChangeLog tests/init.sh
diffstat 2 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -240,9 +240,11 @@
   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.