From: cristy Date: Sun, 11 Nov 2012 17:12:12 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4735 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a21ae824483761f2db9b1905258689a66ea74a5b;p=imagemagick --- diff --git a/MagickCore/token.c b/MagickCore/token.c index c32ec6368..0a76da632 100644 --- a/MagickCore/token.c +++ b/MagickCore/token.c @@ -594,16 +594,31 @@ MagickExport MagickBooleanType GlobExpression(const char *expression, MagickPrivate MagickBooleanType IsGlob(const char *path) { MagickBooleanType - status; + status = MagickFalse; + + register const char + *p; if (IsPathAccessible(path) != MagickFalse) return(MagickFalse); - status=(strchr(path,'*') != (char *) NULL) || - (strchr(path,'?') != (char *) NULL) || - (strchr(path,'{') != (char *) NULL) || - (strchr(path,'}') != (char *) NULL) || - (strchr(path,'[') != (char *) NULL) || - (strchr(path,']') != (char *) NULL) ? MagickTrue : MagickFalse; + for (p=path; *p != '\0'; p++) + { + switch (*p) + { + case '*': + case '?': + case '{': + case '}': + case '[': + case ']': + { + status=MagickTrue; + break; + } + default: + break; + } + } return(status); }