From owner-svn-src-head@FreeBSD.ORG  Wed Dec 21 15:22:06 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6A03F106564A;
	Wed, 21 Dec 2011 15:22:06 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 590358FC1B;
	Wed, 21 Dec 2011 15:22:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBLFM6MA074398;
	Wed, 21 Dec 2011 15:22:06 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBLFM6aE074396;
	Wed, 21 Dec 2011 15:22:06 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201112211522.pBLFM6aE074396@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Wed, 21 Dec 2011 15:22:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228775 - head/contrib/libarchive/libarchive_fe
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Dec 2011 15:22:06 -0000

Author: mm
Date: Wed Dec 21 15:22:05 2011
New Revision: 228775
URL: http://svn.freebsd.org/changeset/base/228775

Log:
  Merge FreeBSD changes from usr.bin/tar to contrib/libarchive/libarchive_fe:
  
  r213469:
  Recognize both ! and ^ as markers for negated character classes.
  
  MFC after:	2 weeks

Modified:
  head/contrib/libarchive/libarchive_fe/pathmatch.c
Directory Properties:
  head/contrib/libarchive/libarchive_fe/   (props changed)

Modified: head/contrib/libarchive/libarchive_fe/pathmatch.c
==============================================================================
--- head/contrib/libarchive/libarchive_fe/pathmatch.c	Wed Dec 21 15:20:17 2011	(r228774)
+++ head/contrib/libarchive/libarchive_fe/pathmatch.c	Wed Dec 21 15:22:05 2011	(r228775)
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
 
 /*
  * Check whether a character 'c' is matched by a list specification [...]:
- *    * Leading '!' negates the class.
+ *    * Leading '!' or '^' negates the class.
  *    * <char>-<char> is a range of characters
  *    * \<char> removes any special meaning for <char>
  *
@@ -60,7 +60,7 @@ pm_list(const char *start, const char *e
 	(void)flags; /* UNUSED */
 
 	/* If this is a negated class, return success for nomatch. */
-	if (*p == '!' && p < end) {
+	if ((*p == '!' || *p == '^') && p < end) {
 		match = 0;
 		nomatch = 1;
 		++p;