# HG changeset patch # User Jim Meyering # Date 1284791603 -7200 # Node ID c11192d889cf28aa713558d72d8420f096f76ded # Parent 64110b464ca28e9c5179f8fe469f18f9a8ad4c1f 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 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-09-18 Jim Meyering + + 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 mirbsd: add some more support diff --git a/tests/init.sh b/tests/init.sh --- 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.