From 19f69f425d4d9a3f52ef042e1b20bed21a633b47 Mon Sep 17 00:00:00 2001 From: kientzle Date: Sat, 20 Jun 2009 06:02:21 +0000 Subject: [PATCH] Fix "tar --options=iso9660:joliet" and other uses of format-specific options. --- lib/libarchive/archive_read.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/libarchive/archive_read.c b/lib/libarchive/archive_read.c index 29e70fe6136a..9274d661cc45 100644 --- a/lib/libarchive/archive_read.c +++ b/lib/libarchive/archive_read.c @@ -117,6 +117,7 @@ archive_read_set_format_options(struct archive *_a, const char *s) struct archive_read *a; struct archive_format_descriptor *format; char key[64], val[64]; + char *valp; size_t i; int len, r; @@ -135,10 +136,10 @@ archive_read_set_format_options(struct archive *_a, const char *s) while ((len = __archive_parse_options(s, format->name, sizeof(key), key, sizeof(val), val)) > 0) { - if (val[0] == '\0') - r = format->options(a, key, NULL); - else - r = format->options(a, key, val); + valp = val[0] == '\0' ? NULL : val; + a->format = format; + r = format->options(a, key, valp); + a->format = NULL; if (r == ARCHIVE_FATAL) return (r); s += len;