aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2003-07-05 21:56:55 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2003-07-05 21:56:55 +0000
commit0fd4d38e1584ccddf28eb42aa8cf59a3c9ad4310 (patch)
tree0cf06f9ee9f5aae40438cfd573c2202be8851198
parentf219ec1d7ea698126e174ed76b987e0e4e3f0c6f (diff)
downloadbusybox-w32-0fd4d38e1584ccddf28eb42aa8cf59a3c9ad4310.tar.gz
busybox-w32-0fd4d38e1584ccddf28eb42aa8cf59a3c9ad4310.tar.bz2
busybox-w32-0fd4d38e1584ccddf28eb42aa8cf59a3c9ad4310.zip
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 git-svn-id: svn://busybox.net/trunk/busybox@7043 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--archival/tar.c11
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)
675 } 675 }
676 if(opt & TAR_OPT_VERBOSE) { 676 if(opt & TAR_OPT_VERBOSE) {
677 if ((tar_handle->action_header == header_list) || 677 if ((tar_handle->action_header == header_list) ||
678 (tar_handle->action_header == header_verbose_list)) { 678 (tar_handle->action_header == header_verbose_list))
679 {
679 tar_handle->action_header = header_verbose_list; 680 tar_handle->action_header = header_verbose_list;
680 } else { 681 } else {
681 tar_handle->action_header = header_list; 682 tar_handle->action_header = header_list;
@@ -724,8 +725,14 @@ int tar_main(int argc, char **argv)
724 gzipFlag = TRUE; 725 gzipFlag = TRUE;
725 } 726 }
726# endif /* CONFIG_FEATURE_TAR_GZIP */ 727# endif /* CONFIG_FEATURE_TAR_GZIP */
728# ifdef CONFIG_FEATURE_TAR_BZIP2
729 if (get_header_ptr == get_header_tar_bz2) {
730 bb_error_msg_and_die("Creating bzip2 compressed archives is not currently supported.");
731 }
732# endif /* CONFIG_FEATURE_TAR_BZIP2 */
727 733
728 if (tar_handle->action_header == header_verbose_list) { 734 if ((tar_handle->action_header == header_list) ||
735 (tar_handle->action_header == header_verbose_list)) {
729 verboseFlag = TRUE; 736 verboseFlag = TRUE;
730 } 737 }
731 writeTarFile(tar_filename, verboseFlag, tar_handle->accept, 738 writeTarFile(tar_filename, verboseFlag, tar_handle->accept,