X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fregex%2Fglob.c;h=6c07e6b3b5f817f57af09cd9e0a74a0d85bb0fc7;hb=743546a9339d3da4304fd63f74872e90ac792f63;hp=bbe78f7d9a345372a0822d4a89d4fbdb5b6d6d16;hpb=787c2648a9bdc9431237abc0fdd61971cbf289cd;p=musl diff --git a/src/regex/glob.c b/src/regex/glob.c index bbe78f7d..6c07e6b3 100644 --- a/src/regex/glob.c +++ b/src/regex/glob.c @@ -117,7 +117,7 @@ static int match_in_dir(const char *d, const char *p, int flags, int (*errfunc)( } else { int mark = 0; if (flags & GLOB_MARK) { - if (de->d_type) + if (de->d_type && !S_ISLNK(de->d_type<<12)) mark = S_ISDIR(de->d_type<<12); else { struct stat st; @@ -156,7 +156,7 @@ static int sort(const void *a, const void *b) return strcmp(*(const char **)a, *(const char **)b); } -int glob(const char *pat, int flags, int (*errfunc)(const char *path, int err), glob_t *g) +int glob(const char *restrict pat, int flags, int (*errfunc)(const char *path, int err), glob_t *restrict g) { const char *p=pat, *d; struct match head = { .next = NULL }, *tail = &head;