X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fregex%2Fglob.c;h=6c07e6b3b5f817f57af09cd9e0a74a0d85bb0fc7;hp=550f655ca8090f434631a0b50e609fc403fe7cb9;hb=dd959163828bda8b03e699de95298fffb2329bb9;hpb=da88b16a221c9d327e1bfa61dd6f4f08dacce57a

diff --git a/src/regex/glob.c b/src/regex/glob.c
index 550f655c..6c07e6b3 100644
--- a/src/regex/glob.c
+++ b/src/regex/glob.c
@@ -58,7 +58,8 @@ static int match_in_dir(const char *d, const char *p, int flags, int (*errfunc)(
 	char *p2;
 	size_t l = strlen(d);
 	int literal;
-	int fnm_flags= ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0) | FNM_PERIOD;
+	int fnm_flags= ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0)
+		| ((!(flags & GLOB_PERIOD)) ? FNM_PERIOD : 0);
 	int error;
 
 	if ((p2 = strchr(p, '/'))) {
@@ -116,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;
@@ -155,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;