[BusyBox-cvs] busybox/archival tar.c,1.174,1.175
Erik Andersen
andersen at busybox.net
Sat Jul 5 21:56:58 UTC 2003
Update of /var/cvs/busybox/archival
In directory winder:/tmp/cvs-serv21196/archival
Modified Files:
tar.c
Log Message:
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
Index: tar.c
===================================================================
RCS file: /var/cvs/busybox/archival/tar.c,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- tar.c 5 Jul 2003 06:38:41 -0000 1.174
+++ tar.c 5 Jul 2003 21:56:55 -0000 1.175
@@ -675,7 +675,8 @@
}
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 @@
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,
More information about the busybox-cvs
mailing list