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) {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
