diff options
| author | Ron Yorston <rmy@pobox.com> | 2017-08-22 16:33:06 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-23 12:19:44 +0200 |
| commit | 6bafcfb67a30dde668cceeab7669082fbcf5a489 (patch) | |
| tree | 44c9561d153f5d340bc466153a9bf52b94f997ab | |
| parent | 3505e38bd1e5714fa1203e6752c573861aab8521 (diff) | |
tar: fix handling of first argument without '-'
The following no longer works as expected:
$ ./busybox tar xfz test.tgz
tar: can't open 'z': No such file or directory
Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -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 9a5bcc7fe..6cf3508ec 100644 --- a/archival/tar.c +++ b/archival/tar.c @@ -953,9 +953,6 @@ int tar_main(int argc UNUSED_PARAM, char **argv) if (getuid() != 0) tar_handle->ah_flags |= ARCHIVE_DONT_RESTORE_PERM; - /* Prepend '-' to the first argument if required */ - if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0') - argv[1] = xasprintf("-%s", argv[1]); #if ENABLE_DESKTOP /* Lie to buildroot when it starts asking stupid questions. */ if (argv[1] && strcmp(argv[1], "--version") == 0) { @@ -992,6 +989,9 @@ int tar_main(int argc UNUSED_PARAM, char **argv) } } #endif + /* Prepend '-' to the first argument if required */ + if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0') + argv[1] = xasprintf("-%s", argv[1]); opt = GETOPT32(argv, "^" "txC:f:Oopvk" IF_FEATURE_TAR_CREATE( "ch" ) |