|
 |
5589dc |
Index: read.c
|
|
|
5589dc |
===================================================================
|
|
|
5589dc |
RCS file: /sources/make/make/read.c,v
|
|
|
5589dc |
retrieving revision 1.198
|
|
|
5589dc |
retrieving revision 1.200
|
|
|
5589dc |
diff -u -r1.198 -r1.200
|
|
|
5589dc |
--- read.c 29 Apr 2011 15:27:39 -0000 1.198
|
|
|
5589dc |
+++ read.c 7 May 2011 14:36:12 -0000 1.200
|
|
|
5589dc |
@@ -2901,6 +2901,7 @@
|
|
|
5589dc |
const char *name;
|
|
|
5589dc |
const char **nlist = 0;
|
|
|
5589dc |
char *tildep = 0;
|
|
|
5589dc |
+ int globme = 1;
|
|
|
5589dc |
#ifndef NO_ARCHIVES
|
|
|
5589dc |
char *arname = 0;
|
|
|
5589dc |
char *memname = 0;
|
|
|
5589dc |
@@ -3109,32 +3110,40 @@
|
|
|
5589dc |
}
|
|
|
5589dc |
#endif /* !NO_ARCHIVES */
|
|
|
5589dc |
|
|
|
5589dc |
- switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
|
|
|
5589dc |
- {
|
|
|
5589dc |
- case GLOB_NOSPACE:
|
|
|
5589dc |
- fatal (NILF, _("virtual memory exhausted"));
|
|
|
5589dc |
-
|
|
|
5589dc |
- case 0:
|
|
|
5589dc |
- /* Success. */
|
|
|
5589dc |
- i = gl.gl_pathc;
|
|
|
5589dc |
- nlist = (const char **)gl.gl_pathv;
|
|
|
5589dc |
- break;
|
|
|
5589dc |
-
|
|
|
5589dc |
- case GLOB_NOMATCH:
|
|
|
5589dc |
- /* If we want only existing items, skip this one. */
|
|
|
5589dc |
- if (flags & PARSEFS_EXISTS)
|
|
|
5589dc |
- {
|
|
|
5589dc |
- i = 0;
|
|
|
5589dc |
- break;
|
|
|
5589dc |
- }
|
|
|
5589dc |
- /* FALLTHROUGH */
|
|
|
5589dc |
-
|
|
|
5589dc |
- default:
|
|
|
5589dc |
- /* By default keep this name. */
|
|
|
5589dc |
+ /* glob() is expensive: don't call it unless we need to. */
|
|
|
5589dc |
+ if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") == NULL)
|
|
|
5589dc |
+ {
|
|
|
5589dc |
+ globme = 0;
|
|
|
5589dc |
i = 1;
|
|
|
5589dc |
nlist = &nam;;
|
|
|
5589dc |
- break;
|
|
|
5589dc |
- }
|
|
|
5589dc |
+ }
|
|
|
5589dc |
+ else
|
|
|
5589dc |
+ switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
|
|
|
5589dc |
+ {
|
|
|
5589dc |
+ case GLOB_NOSPACE:
|
|
|
5589dc |
+ fatal (NILF, _("virtual memory exhausted"));
|
|
|
5589dc |
+
|
|
|
5589dc |
+ case 0:
|
|
|
5589dc |
+ /* Success. */
|
|
|
5589dc |
+ i = gl.gl_pathc;
|
|
|
5589dc |
+ nlist = (const char **)gl.gl_pathv;
|
|
|
5589dc |
+ break;
|
|
|
5589dc |
+
|
|
|
5589dc |
+ case GLOB_NOMATCH:
|
|
|
5589dc |
+ /* If we want only existing items, skip this one. */
|
|
|
5589dc |
+ if (flags & PARSEFS_EXISTS)
|
|
|
5589dc |
+ {
|
|
|
5589dc |
+ i = 0;
|
|
|
5589dc |
+ break;
|
|
|
5589dc |
+ }
|
|
|
5589dc |
+ /* FALLTHROUGH */
|
|
|
5589dc |
+
|
|
|
5589dc |
+ default:
|
|
|
5589dc |
+ /* By default keep this name. */
|
|
|
5589dc |
+ i = 1;
|
|
|
5589dc |
+ nlist = &nam;;
|
|
|
5589dc |
+ break;
|
|
|
5589dc |
+ }
|
|
|
5589dc |
|
|
|
5589dc |
/* For each matched element, add it to the list. */
|
|
|
5589dc |
while (i-- > 0)
|
|
|
5589dc |
@@ -3174,7 +3183,8 @@
|
|
|
5589dc |
#endif /* !NO_ARCHIVES */
|
|
|
5589dc |
NEWELT (concat (2, prefix, nlist[i]));
|
|
|
5589dc |
|
|
|
5589dc |
- globfree (&gl);
|
|
|
5589dc |
+ if (globme)
|
|
|
5589dc |
+ globfree (&gl);
|
|
|
5589dc |
|
|
|
5589dc |
#ifndef NO_ARCHIVES
|
|
|
5589dc |
if (arname)
|
|
|
5589dc |
Index: tests/scripts/functions/wildcard
|
|
|
5589dc |
===================================================================
|
|
|
5589dc |
RCS file: /sources/make/make/tests/scripts/functions/wildcard,v
|
|
|
5589dc |
retrieving revision 1.6
|
|
|
5589dc |
retrieving revision 1.7
|
|
|
5589dc |
diff -u -r1.6 -r1.7
|
|
|
5589dc |
--- tests/scripts/functions/wildcard 13 Jun 2009 21:21:49 -0000 1.6
|
|
|
5589dc |
+++ tests/scripts/functions/wildcard 7 May 2011 14:36:11 -0000 1.7
|
|
|
5589dc |
@@ -88,4 +88,16 @@
|
|
|
5589dc |
!,
|
|
|
5589dc |
'', "\n");
|
|
|
5589dc |
|
|
|
5589dc |
+# TEST #5: wildcard used to verify file existence
|
|
|
5589dc |
+
|
|
|
5589dc |
+touch('xxx.yyy');
|
|
|
5589dc |
+
|
|
|
5589dc |
+run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
|
|
|
5589dc |
+ '', "file=xxx.yyy\n");
|
|
|
5589dc |
+
|
|
|
5589dc |
+unlink('xxx.yyy');
|
|
|
5589dc |
+
|
|
|
5589dc |
+run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
|
|
|
5589dc |
+ '', "file=\n");
|
|
|
5589dc |
+
|
|
|
5589dc |
1;
|