Merge branch 'busybox' into merge

1 files changed, 11 insertions, 10 deletions

diff --git a/archival/tar.c b/archival/tar.c
index c88957734..c87d23597 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -1009,7 +1009,6 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
         /* Prepend '-' to the first argument if required */
         opt_complementary = "--:" // first arg is options
                 "tt:vv:" // count -t,-v
-                IF_FEATURE_TAR_FROM("X::T::") // cumulative lists
 #if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
                 "\xff::" // --exclude=PATTERN is a list
 #endif
@@ -1061,13 +1060,13 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
 #endif
         opt = getopt32(argv,
                 "txC:f:Oopvk"
-                IF_FEATURE_TAR_CREATE(   "ch"  )
-                IF_FEATURE_SEAMLESS_BZ2( "j"   )
-                IF_FEATURE_SEAMLESS_LZMA("a"   )
-                IF_FEATURE_TAR_FROM(     "T:X:")
-                IF_FEATURE_SEAMLESS_GZ(  "z"   )
-                IF_FEATURE_SEAMLESS_XZ(  "J"   )
-                IF_FEATURE_SEAMLESS_Z(   "Z"   )
+                IF_FEATURE_TAR_CREATE(   "ch"    )
+                IF_FEATURE_SEAMLESS_BZ2( "j"     )
+                IF_FEATURE_SEAMLESS_LZMA("a"     )
+                IF_FEATURE_TAR_FROM(     "T:*X:*")
+                IF_FEATURE_SEAMLESS_GZ(  "z"     )
+                IF_FEATURE_SEAMLESS_XZ(  "J"     )
+                IF_FEATURE_SEAMLESS_Z(   "Z"     )
                 IF_FEATURE_TAR_NOPRESERVE_TIME("m")
                 IF_FEATURE_TAR_LONG_OPTIONS("\xf9:") // --strip-components
                 , &base_dir // -C dir
@@ -1228,9 +1227,10 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
         //      /* We need to know whether child (gzip/bzip/etc) exits abnormally */
         //      signal(SIGCHLD, check_errors_in_children);
 
+#if ENABLE_FEATURE_TAR_CREATE
         /* Create an archive */
         if (opt & OPT_CREATE) {
-#if SEAMLESS_COMPRESSION
+# if SEAMLESS_COMPRESSION
                 const char *zipMode = NULL;
                 if (opt & OPT_COMPRESS)
                         zipMode = "compress";
@@ -1242,7 +1242,7 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                         zipMode = "lzma";
                 if (opt & OPT_XZ)
                         zipMode = "xz";
-#endif
+# endif
                 /* NB: writeTarFile() closes tar_handle->src_fd */
                 return writeTarFile(tar_handle->src_fd, verboseFlag,
                                 (opt & OPT_DEREFERENCE ? ACTION_FOLLOWLINKS : 0)
@@ -1250,6 +1250,7 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                                 tar_handle->accept,
                                 tar_handle->reject, zipMode);
         }
+#endif
 
         if (opt & OPT_ANY_COMPRESS) {
                 USE_FOR_MMU(IF_DESKTOP(long long) int FAST_FUNC (*xformer)(transformer_state_t *xstate);)