diff options
| author | Eric Andersen <andersen@codepoet.org> | 2003-07-05 21:56:55 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2003-07-05 21:56:55 +0000 |
| commit | 3c5a83c5672fb784f982fa1f9796b0e86c67e777 (patch) | |
| tree | 0cf06f9ee9f5aae40438cfd573c2202be8851198 | |
| parent | d5a2780aa2fdee601f92df47a63a0945a7197755 (diff) | |
| download | busybox-3c5a83c5672fb784f982fa1f9796b0e86c67e777.tar.gz | |
As noted by Thomas Eckert:
bb-tar "cjf" does not create a valid tbz2-archive -- if fact the result is a
plain tar-file (no compression) -- but does not warn about the unrecognized
parameter combination "cj" (bb does not have bzip2-compression yet, right?).
to fix this I have added an error message stating this does not work.
He also reported
cosmetic: versose "-v" does not show any output when used with "create"
which I have now fixed as well.
-Erik
| -rw-r--r-- | archival/tar.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/archival/tar.c b/archival/tar.c index acc8d54f9..b6c2ef91e 100644 --- a/archival/tar.c +++ b/archival/tar.c @@ -675,7 +675,8 @@ int tar_main(int argc, char **argv) } if(opt & TAR_OPT_VERBOSE) { if ((tar_handle->action_header == header_list) || - (tar_handle->action_header == header_verbose_list)) { + (tar_handle->action_header == header_verbose_list)) + { tar_handle->action_header = header_verbose_list; } else { tar_handle->action_header = header_list; @@ -724,8 +725,14 @@ int tar_main(int argc, char **argv) gzipFlag = TRUE; } # endif /* CONFIG_FEATURE_TAR_GZIP */ +# ifdef CONFIG_FEATURE_TAR_BZIP2 + if (get_header_ptr == get_header_tar_bz2) { + bb_error_msg_and_die("Creating bzip2 compressed archives is not currently supported."); + } +# endif /* CONFIG_FEATURE_TAR_BZIP2 */ - if (tar_handle->action_header == header_verbose_list) { + if ((tar_handle->action_header == header_list) || + (tar_handle->action_header == header_verbose_list)) { verboseFlag = TRUE; } writeTarFile(tar_filename, verboseFlag, tar_handle->accept, |