From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Wed, 9 Nov 2005 13:09:12 +0000 (+0000)
Subject:  (decode_options): Allow to use --multi-volume and --label with pax archives.
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=5eecc4c994a446f00daa4aa594c57be0c0c37b59;hp=cb3d8b0db970780c7857ad8a7fecde4ea533e05a;p=chaz%2Ftar

 (decode_options): Allow to use --multi-volume and --label with pax archives.
---

diff --git a/src/tar.c b/src/tar.c
index 7736993..ef7652f 100644
--- a/src/tar.c
+++ b/src/tar.c
@@ -1667,9 +1667,11 @@ decode_options (int argc, char **argv)
 	archive_format = DEFAULT_ARCHIVE_FORMAT;
     }
 
+  /* FIXME: Merge the four conditionals below */
   if (volume_label_option && subcommand_option == CREATE_SUBCOMMAND)
     assert_format (FORMAT_MASK (OLDGNU_FORMAT)
-		   | FORMAT_MASK (GNU_FORMAT));
+		   | FORMAT_MASK (GNU_FORMAT)
+		   | FORMAT_MASK (POSIX_FORMAT));
 
 
   if (incremental_option)
@@ -1678,7 +1680,9 @@ decode_options (int argc, char **argv)
 		   | FORMAT_MASK (POSIX_FORMAT));
 
   if (multi_volume_option)
-    assert_format (FORMAT_MASK (OLDGNU_FORMAT) | FORMAT_MASK (GNU_FORMAT));
+    assert_format (FORMAT_MASK (OLDGNU_FORMAT)
+		   | FORMAT_MASK (GNU_FORMAT)
+		   | FORMAT_MASK (POSIX_FORMAT));
 
   if (sparse_option)
     assert_format (FORMAT_MASK (OLDGNU_FORMAT)