From: Eric Andersen <andersen@codepoet.org>
Date: Sat, 5 Jul 2003 21:56:55 +0000 (-0000)
Subject: As noted by Thomas Eckert:
X-Git-Tag: 1_00_pre1~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3c5a83c5672fb784f982fa1f9796b0e86c67e777;p=oweals%2Fbusybox.git

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
---

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,