d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1) Don't protect \/ and \. even if user say so. They are not special chars

Browse Source 
in any case and needed for further processing. For ~ expansion too.

2) Don't terminate *pathend with / when GLOB_LIMIT_STAT is reached, it will
be not visible outside in any case since error is returned.

3) Cosmetic: change if expression to better reflect its semantic.
This commit is contained in:
Andrey A. Chernov 2016-07-19 00:25:27 +00:00
parent e9c0137235
commit eef722c337
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=303014
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/libc/gen/glob.c
View File

@ -244,7 +244,8 @@ glob(const char * __restrict pattern, int flags,
return (GLOB_NOMATCH);
else if (clen == 0)
break;
*bufnext++ = wc | prot;
*bufnext++ = wc | ((wc != DOT && wc != SEP) ?
prot : 0);
patnext += clen;
}
}
@ -478,8 +479,8 @@ globtilde(const Char *pattern, Char *patbuf, size_t patbuf_len, glob_t *pglob)
return (NULL);
dc = wbuf;
for (b = patbuf; b < eb && *dc != EOS; *b++ = *dc++ | M_PROTECT)
continue;
for (b = patbuf; b < eb && *dc != EOS; b++, dc++)
*b = *dc | ((*dc != DOT && *dc != SEP) ? M_PROTECT : 0);
if (*dc != EOS)
return (NULL);
@ -642,10 +643,6 @@ glob2(Char *pathbuf, Char *pathend, Char *pathend_last, Char *pattern,
if ((pglob->gl_flags & GLOB_LIMIT) &&
limit->l_stat_cnt++ >= GLOB_LIMIT_STAT) {
errno = 0;
if (pathend + 1 > pathend_last)
return (GLOB_NOSPACE);
*pathend++ = SEP;
*pathend = EOS;
return (GLOB_NOSPACE);
}
if (((pglob->gl_flags & GLOB_MARK) &&
@ -886,7 +883,7 @@ match(Char *name, Char *pat, Char *patend)
ok = 0;
if ((k = *name++) == EOS)
return (0);
if ((negate_range = ((*pat & M_MASK) == M_NOT)) != EOS)
if ((negate_range = ((*pat & M_MASK) == M_NOT)) != 0)
++pat;
while (((c = *pat++) & M_MASK) != M_END)
if ((*pat & M_MASK) == M_RNG) {