From: Rich Felker <dalias@aerifal.cx>
Date: Tue, 24 Jan 2012 00:51:34 +0000 (-0500)
Subject: make glob mark symlinks-to-directories with the GLOB_MARK flag
X-Git-Tag: v0.8.5~47
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d0678b58ab34f9afae099afc839430bdcd91aaac;p=oweals%2Fmusl.git

make glob mark symlinks-to-directories with the GLOB_MARK flag

POSIX is unclear on whether it should, but all historical
implementations seem to behave this way, and it seems more useful to
applications.
---

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