From owner-svn-src-all@freebsd.org  Wed Jul 20 12:46:22 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 57180B9DC45;
 Wed, 20 Jul 2016 12:46:22 +0000 (UTC)
 (envelope-from ache@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 266DC13A2;
 Wed, 20 Jul 2016 12:46:22 +0000 (UTC)
 (envelope-from ache@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6KCkLHA016324;
 Wed, 20 Jul 2016 12:46:21 GMT (envelope-from ache@FreeBSD.org)
Received: (from ache@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6KCkL7X016323;
 Wed, 20 Jul 2016 12:46:21 GMT (envelope-from ache@FreeBSD.org)
Message-Id: <201607201246.u6KCkL7X016323@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ache set sender to
 ache@FreeBSD.org using -f
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Wed, 20 Jul 2016 12:46:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r303088 - head/lib/libc/gen
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Jul 2016 12:46:22 -0000

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;