X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fregex%2Fglob.c;h=3476e010d573b71443f3321e695435df36274197;hp=9a70f0bc20911c441a660e4535deb6682154d8ea;hb=d0678b58ab34f9afae099afc839430bdcd91aaac;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01

diff --git a/src/regex/glob.c b/src/regex/glob.c
index 9a70f0bc..3476e010 100644
--- a/src/regex/glob.c
+++ b/src/regex/glob.c
@@ -53,13 +53,13 @@ static int append(struct match **tail, const char *name, size_t len, int mark)
 static int match_in_dir(const char *d, const char *p, int flags, int (*errfunc)(const char *path, int err), struct match **tail)
 {
 	DIR *dir;
-	long long de_buf[(sizeof(struct dirent) + NAME_MAX + sizeof(long long))/sizeof(long long)];
-	struct dirent *de;
+	struct dirent de_buf, *de;
 	char pat[strlen(p)+1];
 	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, '/'))) {
@@ -94,7 +94,7 @@ static int match_in_dir(const char *d, const char *p, int flags, int (*errfunc)(
 		closedir(dir);
 		return error;
 	}
-	while (!(error = readdir_r(dir, (void *)de_buf, &de)) && de) {
+	while (!(error = readdir_r(dir, &de_buf, &de)) && de) {
 		char namebuf[l+de->d_reclen+2], *name = namebuf;
 		if (!literal && fnmatch(p, de->d_name, fnm_flags))
 			continue;
@@ -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;
@@ -171,6 +171,8 @@ int glob(const char *pat, int flags, int (*errfunc)(const char *path, int err),
 		d = "";
 	}
 
+	if (strlen(p) > PATH_MAX) return GLOB_NOSPACE;
+
 	if (!errfunc) errfunc = ignore_err;
 
 	if (!(flags & GLOB_APPEND)) {