summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--read.c2
-rw-r--r--tests/ChangeLog5
-rw-r--r--tests/scripts/functions/wildcard12
4 files changed, 22 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2556945..a8c865f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-07 Paul Smith <psmith@gnu.org>
+
+ * read.c (parse_file_seq): Ensure existence checks use glob().
+
2011-05-07 Eli Zaretskii <eliz@gnu.org>
* job.c (construct_command_argv_internal): Don't assume shellflags
diff --git a/read.c b/read.c
index 3f72326..c87d4a7 100644
--- a/read.c
+++ b/read.c
@@ -3111,7 +3111,7 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar,
#endif /* !NO_ARCHIVES */
/* glob() is expensive: don't call it unless we need to. */
- if (!(flags & PARSEFS_EXISTS) || strpbrk (name, "?*[") == NULL)
+ if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") == NULL)
{
globme = 0;
i = 1;
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 86c6789..73b49fa 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-07 Paul Smith <psmith@gnu.org>
+
+ * scripts/functions/wildcard: Verify wildcard used to test for
+ file existence/non-existence.
+
2011-05-02 Paul Smith <psmith@gnu.org>
* scripts/functions/sort: Add a test for Savannah bug #33125.
diff --git a/tests/scripts/functions/wildcard b/tests/scripts/functions/wildcard
index 2841f5d..bcd84ad 100644
--- a/tests/scripts/functions/wildcard
+++ b/tests/scripts/functions/wildcard
@@ -88,4 +88,16 @@ all: ; @echo $(wildcard xz--y*.7)
!,
'', "\n");
+# TEST #5: wildcard used to verify file existence
+
+touch('xxx.yyy');
+
+run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
+ '', "file=xxx.yyy\n");
+
+unlink('xxx.yyy');
+
+run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
+ '', "file=\n");
+
1;