[PATCH] glob: fix / matching

[Julien Ramseier <j.ramseier@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 129 bytes --]

glob(3) currently fails matching "/", due to any '/' being
removed from the start of the pattern before checking if
it's empty.


[-- Attachment #2: glob.patch --]
[-- Type: application/octet-stream, Size: 1416 bytes --]

diff --git a/src/regex/glob.c b/src/regex/glob.c
index 5b6ff12..53f3a4e 100644
--- a/src/regex/glob.c
+++ b/src/regex/glob.c
@@ -156,18 +156,11 @@ static int sort(const void *a, const void *b)
 
 int glob(const char *restrict pat, int flags, int (*errfunc)(const char *path, int err), glob_t *restrict g)
 {
-	const char *p=pat, *d;
+	const char *p = pat;
 	struct match head = { .next = NULL }, *tail = &head;
 	size_t cnt, i;
 	size_t offs = (flags & GLOB_DOOFFS) ? g->gl_offs : 0;
 	int error = 0;
-	
-	if (*p == '/') {
-		for (; *p == '/'; p++);
-		d = "/";
-	} else {
-		d = "";
-	}
 
 	if (!errfunc) errfunc = ignore_err;
 
@@ -179,12 +172,19 @@ int glob(const char *restrict pat, int flags, int (*errfunc)(const char *path, i
 
 	if (strnlen(p, PATH_MAX+1) > PATH_MAX) return GLOB_NOSPACE;
 
-	if (*p) error = match_in_dir(d, p, flags, errfunc, &tail);
+	if (*p) {
+		const char *d = "";
+		if (*p == '/') {
+			for (; *p == '/'; p++);
+			d = "/";
+		}
+		error = match_in_dir(d, p, flags, errfunc, &tail);
+	}
 	if (error == GLOB_NOSPACE) {
 		freelist(&head);
 		return error;
 	}
-	
+
 	for (cnt=0, tail=head.next; tail; tail=tail->next, cnt++);
 	if (!cnt) {
 		if (flags & GLOB_NOCHECK) {
@@ -220,7 +220,7 @@ int glob(const char *restrict pat, int flags, int (*errfunc)(const char *path, i
 
 	if (!(flags & GLOB_NOSORT))
 		qsort(g->gl_pathv+offs, cnt, sizeof(char *), sort);
-	
+
 	return error;
 }
 

[-- Attachment #3: Type: text/plain, Size: 100 bytes --]



Also, any feedback concerning
http://www.openwall.com/lists/musl/2017/01/12/5 ? 

Thanks,
Julien