Re: [PATCH] glob: fix / matching

[Rich Felker <dalias@libc.org>]

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

On Sun, May 28, 2017 at 05:06:45PM +0200, Julien Ramseier wrote:
> 
> > Le 28 mai 2017 à 04:55, Rich Felker <dalias@libc.org> a écrit :
> >> 
> >> I'm confused how this patch differs from just removing the "if (*p)"
> >> condition before calling match_in_dir. Does match_in_dir actually work
> >> if p points to an empty string? I thought not...
> > 
> > Hmm, just removing the "if (*p)" seems to make it work; it looks like
> > match_in_dir covers this case fine. I'd like a second opinion on
> > whether this looks okay since I haven't touched this code in years,
> > but I suspect it'll turn out to be an okay fix for now...
> > 
> 
> 
> The "if (*p)" is needed, otherwise match_in_dir will append an empty
> match when p = "". 

Indeed. How about the attached?

I did look at your patch, and although it's probably fine, it does
have additional side effects like moving the length check across the
slash-skipping. That's part of why I looked for a minimally invasive
approach.

Rich

[-- Attachment #2: globroot.diff --]
[-- Type: text/plain, Size: 484 bytes --]

diff --git a/src/regex/glob.c b/src/regex/glob.c
index 5b6ff12..2d4d562 100644
--- a/src/regex/glob.c
+++ b/src/regex/glob.c
@@ -179,7 +179,7 @@ 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 (*pat) error = match_in_dir(d, p, flags, errfunc, &tail);
 	if (error == GLOB_NOSPACE) {
 		freelist(&head);
 		return error;