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

diff --git a/src/regex/glob.c b/src/regex/glob.c
index 550f655c..3476e010 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;