diff options
-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) | |||
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, |