From owner-svn-src-head@FreeBSD.ORG  Fri Apr 17 01:03:52 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 6C00E106566B;
	Fri, 17 Apr 2009 01:03:52 +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 593918FC12;
	Fri, 17 Apr 2009 01:03:52 +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 n3H13qwN099847;
	Fri, 17 Apr 2009 01:03:52 GMT
	(envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3H13qUZ099846;
	Fri, 17 Apr 2009 01:03:52 GMT
	(envelope-from kientzle@svn.freebsd.org)
Message-Id: <200904170103.n3H13qUZ099846@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Fri, 17 Apr 2009 01:03:52 +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: r191181 - head/lib/libarchive
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: Fri, 17 Apr 2009 01:03:52 -0000

Author: kientzle
Date: Fri Apr 17 01:03:52 2009
New Revision: 191181
URL: http://svn.freebsd.org/changeset/base/191181

Log:
  Ensure that the option setters return OK (option used) even
  for options that don't change the list of keywords.

Modified:
  head/lib/libarchive/archive_write_set_format_mtree.c

Modified: head/lib/libarchive/archive_write_set_format_mtree.c
==============================================================================
--- head/lib/libarchive/archive_write_set_format_mtree.c	Fri Apr 17 01:02:56 2009	(r191180)
+++ head/lib/libarchive/archive_write_set_format_mtree.c	Fri Apr 17 01:03:52 2009	(r191181)
@@ -962,8 +962,10 @@ archive_write_mtree_options(struct archi
 	case 'd':
 		if (strcmp(key, "device") == 0)
 			keybit = F_DEV;
-		else if (strcmp(key, "dironly") == 0)
+		else if (strcmp(key, "dironly") == 0) {
 			mtree->dironly = (value != NULL)? 1: 0;
+			return (ARCHIVE_OK);
+		}
 		break;
 	case 'f':
 		if (strcmp(key, "flags") == 0)
@@ -976,8 +978,10 @@ archive_write_mtree_options(struct archi
 			keybit = F_GNAME;
 		break;
 	case 'i':
-		if (strcmp(key, "indent") == 0)
+		if (strcmp(key, "indent") == 0) {
 			mtree->indent = (value != NULL)? 1: 0;
+			return (ARCHIVE_OK);
+		}
 		break;
 	case 'l':
 		if (strcmp(key, "link") == 0)
@@ -1039,8 +1043,10 @@ archive_write_mtree_options(struct archi
 			keybit = F_UID;
 		else if (strcmp(key, "uname") == 0)
 			keybit = F_UNAME;
-		else if (strcmp(key, "use-set") == 0)
+		else if (strcmp(key, "use-set") == 0) {
 			mtree->set.output = (value != NULL)? 1: 0;
+			return (ARCHIVE_OK);
+		}
 		break;
 	}
 	if (keybit != 0) {