aboutsummaryrefslogtreecommitdiff
path: root/archival/tar.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2016-06-19 18:15:33 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2016-06-19 18:15:33 +0200
commit015db5800ca7c6dd2d201eacb2951e72e6782b30 (patch)
tree0fe9b90c782f2ac831f30793e384b07bd690b3b3 /archival/tar.c
parentce824aecf216536beed00d7817a614ffb8572239 (diff)
downloadbusybox-w32-015db5800ca7c6dd2d201eacb2951e72e6782b30.tar.gz
busybox-w32-015db5800ca7c6dd2d201eacb2951e72e6782b30.tar.bz2
busybox-w32-015db5800ca7c6dd2d201eacb2951e72e6782b30.zip
randomconfig fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival/tar.c')
-rw-r--r--archival/tar.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/archival/tar.c b/archival/tar.c
index 346a9404e..7434e22e4 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -1199,9 +1199,10 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
1199 // /* We need to know whether child (gzip/bzip/etc) exits abnormally */ 1199 // /* We need to know whether child (gzip/bzip/etc) exits abnormally */
1200 // signal(SIGCHLD, check_errors_in_children); 1200 // signal(SIGCHLD, check_errors_in_children);
1201 1201
1202#if ENABLE_FEATURE_TAR_CREATE
1202 /* Create an archive */ 1203 /* Create an archive */
1203 if (opt & OPT_CREATE) { 1204 if (opt & OPT_CREATE) {
1204#if SEAMLESS_COMPRESSION 1205# if SEAMLESS_COMPRESSION
1205 const char *zipMode = NULL; 1206 const char *zipMode = NULL;
1206 if (opt & OPT_COMPRESS) 1207 if (opt & OPT_COMPRESS)
1207 zipMode = "compress"; 1208 zipMode = "compress";
@@ -1213,7 +1214,7 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
1213 zipMode = "lzma"; 1214 zipMode = "lzma";
1214 if (opt & OPT_XZ) 1215 if (opt & OPT_XZ)
1215 zipMode = "xz"; 1216 zipMode = "xz";
1216#endif 1217# endif
1217 /* NB: writeTarFile() closes tar_handle->src_fd */ 1218 /* NB: writeTarFile() closes tar_handle->src_fd */
1218 return writeTarFile(tar_handle->src_fd, verboseFlag, 1219 return writeTarFile(tar_handle->src_fd, verboseFlag,
1219 (opt & OPT_DEREFERENCE ? ACTION_FOLLOWLINKS : 0) 1220 (opt & OPT_DEREFERENCE ? ACTION_FOLLOWLINKS : 0)
@@ -1221,6 +1222,7 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
1221 tar_handle->accept, 1222 tar_handle->accept,
1222 tar_handle->reject, zipMode); 1223 tar_handle->reject, zipMode);
1223 } 1224 }
1225#endif
1224 1226
1225 if (opt & OPT_ANY_COMPRESS) { 1227 if (opt & OPT_ANY_COMPRESS) {
1226 USE_FOR_MMU(IF_DESKTOP(long long) int FAST_FUNC (*xformer)(transformer_state_t *xstate);) 1228 USE_FOR_MMU(IF_DESKTOP(long long) int FAST_FUNC (*xformer)(transformer_state_t *xstate);)