diff options
author | Ron Yorston <rmy@pobox.com> | 2017-08-23 13:41:51 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2017-08-23 13:41:51 +0100 |
commit | 0f8d2b47dc78f9915a9ccdec29ef5c148011d583 (patch) | |
tree | f74be68cbc1ac86e7f2cc7745cfae84572f28328 /archival/tar.c | |
parent | 5446bac31b5f02eb3337e7e528c3c24ff006bd8d (diff) | |
parent | 6bafcfb67a30dde668cceeab7669082fbcf5a489 (diff) | |
download | busybox-w32-0f8d2b47dc78f9915a9ccdec29ef5c148011d583.tar.gz busybox-w32-0f8d2b47dc78f9915a9ccdec29ef5c148011d583.tar.bz2 busybox-w32-0f8d2b47dc78f9915a9ccdec29ef5c148011d583.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'archival/tar.c')
-rw-r--r-- | archival/tar.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/archival/tar.c b/archival/tar.c index 503444796..46e2e4fcc 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
@@ -982,9 +982,6 @@ int tar_main(int argc UNUSED_PARAM, char **argv) | |||
982 | if (getuid() != 0) | 982 | if (getuid() != 0) |
983 | tar_handle->ah_flags |= ARCHIVE_DONT_RESTORE_PERM; | 983 | tar_handle->ah_flags |= ARCHIVE_DONT_RESTORE_PERM; |
984 | 984 | ||
985 | /* Prepend '-' to the first argument if required */ | ||
986 | if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0') | ||
987 | argv[1] = xasprintf("-%s", argv[1]); | ||
988 | #if ENABLE_DESKTOP | 985 | #if ENABLE_DESKTOP |
989 | /* Lie to buildroot when it starts asking stupid questions. */ | 986 | /* Lie to buildroot when it starts asking stupid questions. */ |
990 | if (argv[1] && strcmp(argv[1], "--version") == 0) { | 987 | if (argv[1] && strcmp(argv[1], "--version") == 0) { |
@@ -1021,6 +1018,9 @@ int tar_main(int argc UNUSED_PARAM, char **argv) | |||
1021 | } | 1018 | } |
1022 | } | 1019 | } |
1023 | #endif | 1020 | #endif |
1021 | /* Prepend '-' to the first argument if required */ | ||
1022 | if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0') | ||
1023 | argv[1] = xasprintf("-%s", argv[1]); | ||
1024 | opt = GETOPT32(argv, "^" | 1024 | opt = GETOPT32(argv, "^" |
1025 | "txC:f:Oopvk" | 1025 | "txC:f:Oopvk" |
1026 | IF_FEATURE_TAR_CREATE( "ch" ) | 1026 | IF_FEATURE_TAR_CREATE( "ch" ) |