svn commit: r303088 - head/lib/libc/gen

[Andrey A. Chernov]

Author: ache
Date: Wed Jul 20 12:46:21 2016
New Revision: 303088
URL: https://svnweb.freebsd.org/changeset/base/303088

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

Modified:
  head/lib/libc/gen/glob.c

Modified: head/lib/libc/gen/glob.c
==============================================================================
--- head/lib/libc/gen/glob.c	Wed Jul 20 11:23:06 2016	(r303087)
+++ head/lib/libc/gen/glob.c	Wed Jul 20 12:46:21 2016	(r303088)
@@ -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 *pat
 	 */
 	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;