This patch replaces the internal integer constant from
__glob_pattern_type return with a proper enum.
Checked on x86_64-linux-gnu and on a build using build-many-glibcs.py
for all major architectures.
* posix/glob_internal.h (glob_pattern_type_t): New enumeration.
(__glob_pattern_type): Use __glob_pat_types.
* posix/glob_pattern_p.c (__glob_pattern_p): Likewise.
* posix/glob.c (glob): Likewise.
(glob_in_dir): Likewise.
2017-09-08 Adhemerval Zanella <adhemerval.zanella@linaro.org>
2017-09-08 Adhemerval Zanella <adhemerval.zanella@linaro.org>
+ * posix/glob_internal.h (GLOBPAT_NONE, GLOBPAT_SPECIAL)
+ (GLOBPAT_BACKSLASH, GLOBPAT_BRACKET): New constants.
+ * posix/glob_internal.h (__glob_pattern_type):
+ * posix/glob.c (glob):
+ * posix/glob_pattern_p.c (__glob_pattern_p):
+ Use them.
+
* sysdeps/unix/sysv/linux/arm/glob64.c: Remove file.
* sysdeps/unix/sysv/linux/i386/glob64.c: Likewise.
* sysdeps/unix/sysv/linux/m68k/glob64.c: Likewise.
* sysdeps/unix/sysv/linux/arm/glob64.c: Remove file.
* sysdeps/unix/sysv/linux/i386/glob64.c: Likewise.
* sysdeps/unix/sysv/linux/m68k/glob64.c: Likewise.
[ which we handle the same, using fnmatch. Broken unterminated
pattern bracket expressions ought to be rare enough that it is
not worth special casing them, fnmatch will do the right thing. */
[ which we handle the same, using fnmatch. Broken unterminated
pattern bracket expressions ought to be rare enough that it is
not worth special casing them, fnmatch will do the right thing. */
+ if (meta & (GLOBPAT_SPECIAL | GLOBPAT_BRACKET))
{
/* The directory name contains metacharacters, so we
have to glob for the directory, and then glob for
{
/* The directory name contains metacharacters, so we
have to glob for the directory, and then glob for
size_t old_pathc = pglob->gl_pathc;
int orig_flags = flags;
size_t old_pathc = pglob->gl_pathc;
int orig_flags = flags;
+ if (meta & GLOBPAT_BACKSLASH)
{
char *p = strchr (dirname, '\\'), *q;
/* We need to unescape the dirname string. It is certainly
{
char *p = strchr (dirname, '\\'), *q;
/* We need to unescape the dirname string. It is certainly
/ sizeof init_names->name[0]);
meta = __glob_pattern_type (pattern, !(flags & GLOB_NOESCAPE));
/ sizeof init_names->name[0]);
meta = __glob_pattern_type (pattern, !(flags & GLOB_NOESCAPE));
- if (meta == 0 && (flags & (GLOB_NOCHECK|GLOB_NOMAGIC)))
+ if (meta == GLOBPAT_NONE && (flags & (GLOB_NOCHECK|GLOB_NOMAGIC)))
{
/* We need not do any tests. The PATTERN contains no meta
characters and we must not return an error therefore the
result will always contain exactly one name. */
flags |= GLOB_NOCHECK;
}
{
/* We need not do any tests. The PATTERN contains no meta
characters and we must not return an error therefore the
result will always contain exactly one name. */
flags |= GLOB_NOCHECK;
}
+ else if (meta == GLOBPAT_NONE)
#ifndef GLOB_INTERNAL_H
# define GLOB_INTERNAL_H
#ifndef GLOB_INTERNAL_H
# define GLOB_INTERNAL_H
+enum
+{
+ GLOBPAT_NONE = 0x0,
+ GLOBPAT_SPECIAL = 0x1,
+ GLOBPAT_BACKSLASH = 0x2,
+ GLOBPAT_BRACKET = 0x4
+};
+
static inline int
__glob_pattern_type (const char *pattern, int quote)
{
const char *p;
static inline int
__glob_pattern_type (const char *pattern, int quote)
{
const char *p;
+ int ret = GLOBPAT_NONE;
for (p = pattern; *p != '\0'; ++p)
switch (*p)
{
case '?':
case '*':
for (p = pattern; *p != '\0'; ++p)
switch (*p)
{
case '?':
case '*':
+ return GLOBPAT_SPECIAL;
case '\\':
if (quote)
{
if (p[1] != '\0')
++p;
case '\\':
if (quote)
{
if (p[1] != '\0')
++p;
+ ret |= GLOBPAT_BACKSLASH;
+ ret |= GLOBPAT_BRACKET;
break;
case ']':
if (ret & 4)
break;
case ']':
if (ret & 4)
+ return GLOBPAT_SPECIAL;
int
__glob_pattern_p (const char *pattern, int quote)
{
int
__glob_pattern_p (const char *pattern, int quote)
{
- return __glob_pattern_type (pattern, quote) == 1;
+ return __glob_pattern_type (pattern, quote) == GLOBPAT_SPECIAL;
}
weak_alias (__glob_pattern_p, glob_pattern_p)
}
weak_alias (__glob_pattern_p, glob_pattern_p)