aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-01-16 20:00:24 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2011-01-16 20:00:24 +0100
commit12d97b66805f87e535962963e858fc2422ffdbc7 (patch)
tree10836c6158a05a505d8a7cb83313cc908e837a50 /archival
parent2a1571bfa003233470140a17be4ae4f0239f5a24 (diff)
downloadbusybox-w32-1_18_2.tar.gz
busybox-w32-1_18_2.tar.bz2
busybox-w32-1_18_2.zip
apply post-1.18.1 patches, bump version to 1.18.21_18_2
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival')
-rw-r--r--archival/bzip2.c6
-rw-r--r--archival/cpio.c4
-rw-r--r--archival/libarchive/bz/bzlib.c4
3 files changed, 5 insertions, 9 deletions
diff --git a/archival/bzip2.c b/archival/bzip2.c
index a6abc931c..ab08ffc1a 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -128,10 +128,12 @@ IF_DESKTOP(long long) int FAST_FUNC compressStream(unpack_info_t *info UNUSED_PA
128 break; 128 break;
129 } 129 }
130 130
131#if ENABLE_FEATURE_CLEAN_UP 131 /* Can't be conditional on ENABLE_FEATURE_CLEAN_UP -
132 * we are called repeatedly
133 */
132 BZ2_bzCompressEnd(strm); 134 BZ2_bzCompressEnd(strm);
133 free(iobuf); 135 free(iobuf);
134#endif 136
135 return total; 137 return total;
136} 138}
137 139
diff --git a/archival/cpio.c b/archival/cpio.c
index 6ab268821..9fa8badc5 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -308,16 +308,12 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
308 /* -L makes sense only with -o or -p */ 308 /* -L makes sense only with -o or -p */
309 309
310#if !ENABLE_FEATURE_CPIO_O 310#if !ENABLE_FEATURE_CPIO_O
311 /* no parameters */
312 opt_complementary = "=0";
313 opt = getopt32(argv, OPTION_STR, &cpio_filename); 311 opt = getopt32(argv, OPTION_STR, &cpio_filename);
314 argv += optind; 312 argv += optind;
315 if (opt & CPIO_OPT_FILE) { /* -F */ 313 if (opt & CPIO_OPT_FILE) { /* -F */
316 xmove_fd(xopen(cpio_filename, O_RDONLY), STDIN_FILENO); 314 xmove_fd(xopen(cpio_filename, O_RDONLY), STDIN_FILENO);
317 } 315 }
318#else 316#else
319 /* _exactly_ one parameter for -p, thus <= 1 param if -p is allowed */
320 opt_complementary = ENABLE_FEATURE_CPIO_P ? "?1" : "=0";
321 opt = getopt32(argv, OPTION_STR "oH:" IF_FEATURE_CPIO_P("p"), &cpio_filename, &cpio_fmt); 317 opt = getopt32(argv, OPTION_STR "oH:" IF_FEATURE_CPIO_P("p"), &cpio_filename, &cpio_fmt);
322 argv += optind; 318 argv += optind;
323 if ((opt & (CPIO_OPT_FILE|CPIO_OPT_CREATE)) == CPIO_OPT_FILE) { /* -F without -o */ 319 if ((opt & (CPIO_OPT_FILE|CPIO_OPT_CREATE)) == CPIO_OPT_FILE) { /* -F without -o */
diff --git a/archival/libarchive/bz/bzlib.c b/archival/libarchive/bz/bzlib.c
index b3beeabed..5f7db747a 100644
--- a/archival/libarchive/bz/bzlib.c
+++ b/archival/libarchive/bz/bzlib.c
@@ -361,7 +361,6 @@ int BZ2_bzCompress(bz_stream *strm, int action)
361 361
362 362
363/*---------------------------------------------------*/ 363/*---------------------------------------------------*/
364#if ENABLE_FEATURE_CLEAN_UP
365static 364static
366void BZ2_bzCompressEnd(bz_stream *strm) 365void BZ2_bzCompressEnd(bz_stream *strm)
367{ 366{
@@ -372,9 +371,8 @@ void BZ2_bzCompressEnd(bz_stream *strm)
372 free(s->arr2); 371 free(s->arr2);
373 free(s->ftab); 372 free(s->ftab);
374 free(s->crc32table); 373 free(s->crc32table);
375 free(strm->state); 374 free(s);
376} 375}
377#endif
378 376
379 377
380/*---------------------------------------------------*/ 378/*---------------------------------------------------*/