mirror of
https://github.com/mirror/make.git
synced 2025-01-14 14:20:20 +08:00
- Fixes Savannah bug #18435
This commit is contained in:
parent
bf9822658f
commit
38b23bc3f0
@ -1,5 +1,9 @@
|
|||||||
2009-06-13 Paul Smith <psmith@gnu.org>
|
2009-06-13 Paul Smith <psmith@gnu.org>
|
||||||
|
|
||||||
|
* ar.c (ar_name): Ensure that targets with empty parens aren't
|
||||||
|
considered archive member references: archive members must have a
|
||||||
|
non-empty "member" string. Fixes Savannah bug #18435.
|
||||||
|
|
||||||
* function.c (string_glob): Rely on multi_glob() to determine
|
* function.c (string_glob): Rely on multi_glob() to determine
|
||||||
whether files exist or not. Remove call to file_exists_p() which
|
whether files exist or not. Remove call to file_exists_p() which
|
||||||
is not always correct. Fixes Savannah bug #21231.
|
is not always correct. Fixes Savannah bug #21231.
|
||||||
|
7
ar.c
7
ar.c
@ -24,8 +24,9 @@ this program. If not, see <http://www.gnu.org/licenses/>. */
|
|||||||
#include "dep.h"
|
#include "dep.h"
|
||||||
#include <fnmatch.h>
|
#include <fnmatch.h>
|
||||||
|
|
||||||
/* Return nonzero if NAME is an archive-member reference, zero if not.
|
/* Return nonzero if NAME is an archive-member reference, zero if not. An
|
||||||
An archive-member reference is a name like `lib(member)'.
|
archive-member reference is a name like `lib(member)' where member is a
|
||||||
|
non-empty string.
|
||||||
If a name like `lib((entry))' is used, a fatal error is signaled at
|
If a name like `lib((entry))' is used, a fatal error is signaled at
|
||||||
the attempt to use this unsupported feature. */
|
the attempt to use this unsupported feature. */
|
||||||
|
|
||||||
@ -39,7 +40,7 @@ ar_name (const char *name)
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
end = p + strlen (p) - 1;
|
end = p + strlen (p) - 1;
|
||||||
if (*end != ')')
|
if (*end != ')' || end == p + 1)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (p[1] == '(' && end[-1] == ')')
|
if (p[1] == '(' && end[-1] == ')')
|
||||||
|
Loading…
Reference in New Issue
Block a user