From owner-svn-src-head@FreeBSD.ORG  Thu Mar  5 00:41:03 2009
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 02402106564A;
	Thu,  5 Mar 2009 00:41:03 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E53A08FC0A;
	Thu,  5 Mar 2009 00:41:02 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n250f20q057755;
	Thu, 5 Mar 2009 00:41:02 GMT (envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n250f2uV057754;
	Thu, 5 Mar 2009 00:41:02 GMT (envelope-from kientzle@svn.freebsd.org)
Message-Id: <200903050041.n250f2uV057754@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Thu, 5 Mar 2009 00:41:02 +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: r189384 - head/lib/libarchive/test
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: Thu, 05 Mar 2009 00:41:03 -0000

Author: kientzle
Date: Thu Mar  5 00:41:02 2009
New Revision: 189384
URL: http://svn.freebsd.org/changeset/base/189384

Log:
  Merge r362 from libarchive.googlecode.com: Minor fix to
  custom argument parser.

Modified:
  head/lib/libarchive/test/main.c

Modified: head/lib/libarchive/test/main.c
==============================================================================
--- head/lib/libarchive/test/main.c	Thu Mar  5 00:36:13 2009	(r189383)
+++ head/lib/libarchive/test/main.c	Thu Mar  5 00:41:02 2009	(r189384)
@@ -975,9 +975,10 @@ int main(int argc, char **argv)
 	 */
 	++argv; --argc;/* Skip program name */
 	while (*argv != NULL) {
+		if (**argv != '-')
+			break;
 		p = *argv++;
-		if (*p++ != '-')
-			usage(progname);
+		++p; /* Skip '-' */
 		while (*p != '\0') {
 			option = *p++;
 			option_arg = NULL;