From 68342c46d33cdca5e2215286ca789429d925bab7 Mon Sep 17 00:00:00 2001 From: psmith Date: Sat, 7 May 2011 14:36:11 +0000 Subject: [PATCH] Inverted the boolean test from what I wanted it to be. Added a regression test to make sure this continues to work. --- ChangeLog | 4 ++++ read.c | 2 +- tests/ChangeLog | 5 +++++ tests/scripts/functions/wildcard | 12 ++++++++++++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2556945..a8c865f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-05-07 Paul Smith + + * read.c (parse_file_seq): Ensure existence checks use glob(). + 2011-05-07 Eli Zaretskii * 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 + + * scripts/functions/wildcard: Verify wildcard used to test for + file existence/non-existence. + 2011-05-02 Paul Smith * 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; -- 2.11.4.GIT