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

diff --git a/src/tar.c b/src/tar.c
index 7736993cfe956d39326b3bdf39409fa97731bbd9..ef7652f95c4605ad5e381bfe4c537ce1840c7c8e 100644 (file)
--- a/src/tar.c
+++ b/src/tar.c
@@ -1667,9 +1667,11 @@ decode_options (int argc, char **argv)
        archive_format = DEFAULT_ARCHIVE_FORMAT;
     }
 
        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)
   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)
 
 
   if (incremental_option)


@@ -1678,7 +1680,9 @@ decode_options (int argc, char **argv)
                   | FORMAT_MASK (POSIX_FORMAT));
 
   if (multi_volume_option)
                   | 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)
 
   if (sparse_option)
     assert_format (FORMAT_MASK (OLDGNU_FORMAT)