1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-20 11:11:24 +00:00

In addition to r303074 case 1, search for protected L'/' too in globtilde()

This commit is contained in:
Andrey A. Chernov 2016-07-20 12:46:21 +00:00
parent 280ab2edb1
commit 7455a07a9f
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=303088

View File

@ -126,7 +126,6 @@ struct glob_limit {
#define TILDE L'~'
#define LBRACE L'{'
#define RBRACE L'}'
#define SLASH L'/'
#define COMMA L','
#ifndef DEBUG
@ -427,10 +426,10 @@ globtilde(const Char *pattern, Char *patbuf, size_t patbuf_len, glob_t *pglob)
*/
eb = &patbuf[patbuf_len - 1];
for (p = pattern + 1, b = patbuf;
b < eb && *p != EOS && *p != SLASH; *b++ = *p++)
b < eb && *p != EOS && UNPROT(*p) != SEP; *b++ = *p++)
continue;
if (*p != EOS && *p != SLASH)
if (*p != EOS && UNPROT(*p) != SEP)
return (NULL);
*b = EOS;