diff options
| author | Roland McGrath <roland@gnu.org> | 1996-01-13 00:46:48 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-01-13 00:46:48 +0000 |
| commit | 02ac66c50d2faf11677911fd99579869f24795ef (patch) | |
| tree | bafee0af52b84a7fe2f40725fa158ab6e7d1d6e1 /posix/glob.c | |
| parent | d94d8f2a5960683c324e184f1240b0c26fd3bc09 (diff) | |
Fri Jan 12 13:40:01 1996 Roland McGrath <roland@churchy.gnu.ai.mit.edu>cvs/libc-960113
* posix/gnu/types.h: Moved to sysdeps/generic/gnu/types.h.
* posix/glob.c (glob): Add parens in glob call flags arg for
GLOB_BRACE case.
* string/string.h (strdupa): New macro.
* stdio-common/vfscanf.c (%[): Grok ] as first char in set, not
terminator on empty set. From drepper.
Diffstat (limited to 'posix/glob.c')
| -rw-r--r-- | posix/glob.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/posix/glob.c b/posix/glob.c index 954960cb18..259ac020d2 100644 --- a/posix/glob.c +++ b/posix/glob.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -290,7 +290,7 @@ glob (pattern, flags, errfunc, pglob) memcpy (buf, pattern, begin - pattern); memcpy (buf + (begin - pattern), p, comma - p); memcpy (buf + (begin - pattern) + (comma - p), end, restlen); - result = glob (buf, (flags & ~(GLOB_NOCHECK|GLOB_NOMAGIC) | + result = glob (buf, ((flags & ~(GLOB_NOCHECK|GLOB_NOMAGIC)) | GLOB_APPEND), errfunc, pglob); if (result && result != GLOB_NOMATCH) return result; |