aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2021-06-28 07:46:32 +0100
committerRon Yorston <rmy@pobox.com>2021-06-28 07:46:32 +0100
commite1ad66c0b8fd58a7158d40771175a7dab224202d (patch)
tree959d687eee9637151ad5798322586174de331141 /archival
parent0fdf99bee07b6c38795eb5415b5e337ab82cfba8 (diff)
parent5dbbd0a6f52befe6bc57baf97d39168e595197f1 (diff)
downloadbusybox-w32-e1ad66c0b8fd58a7158d40771175a7dab224202d.tar.gz
busybox-w32-e1ad66c0b8fd58a7158d40771175a7dab224202d.tar.bz2
busybox-w32-e1ad66c0b8fd58a7158d40771175a7dab224202d.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'archival')
-rw-r--r--archival/bbunzip.c10
-rw-r--r--archival/bzip2.c4
-rw-r--r--archival/gzip.c4
-rw-r--r--archival/libarchive/decompress_unlzma.c5
-rw-r--r--archival/libarchive/get_header_cpio.c3
-rw-r--r--archival/lzop.c1
-rw-r--r--archival/tar.c2
-rw-r--r--archival/unzip.c4
8 files changed, 23 insertions, 10 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 2beb92763..467996071 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -286,7 +286,7 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
286//usage: "\n -c Write to stdout" 286//usage: "\n -c Write to stdout"
287//usage: "\n -f Force" 287//usage: "\n -f Force"
288//usage: "\n -k Keep input files" 288//usage: "\n -k Keep input files"
289//usage: "\n -t Test file integrity" 289//usage: "\n -t Test integrity"
290//usage: 290//usage:
291//usage:#define gunzip_example_usage 291//usage:#define gunzip_example_usage
292//usage: "$ ls -la /tmp/BusyBox*\n" 292//usage: "$ ls -la /tmp/BusyBox*\n"
@@ -409,6 +409,8 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
409//usage: "\n -c Write to stdout" 409//usage: "\n -c Write to stdout"
410//usage: "\n -f Force" 410//usage: "\n -f Force"
411//usage: "\n -k Keep input files" 411//usage: "\n -k Keep input files"
412//usage: "\n -t Test integrity"
413//usage:
412//usage:#define bzcat_trivial_usage 414//usage:#define bzcat_trivial_usage
413//usage: "[FILE]..." 415//usage: "[FILE]..."
414//usage:#define bzcat_full_usage "\n\n" 416//usage:#define bzcat_full_usage "\n\n"
@@ -467,6 +469,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
467//usage: "\n -c Write to stdout" 469//usage: "\n -c Write to stdout"
468//usage: "\n -f Force" 470//usage: "\n -f Force"
469//usage: "\n -k Keep input files" 471//usage: "\n -k Keep input files"
472//usage: "\n -t Test integrity"
470//usage: 473//usage:
471//usage:#define lzma_trivial_usage 474//usage:#define lzma_trivial_usage
472//usage: "-d [-cfk] [FILE]..." 475//usage: "-d [-cfk] [FILE]..."
@@ -476,6 +479,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
476//usage: "\n -c Write to stdout" 479//usage: "\n -c Write to stdout"
477//usage: "\n -f Force" 480//usage: "\n -f Force"
478//usage: "\n -k Keep input files" 481//usage: "\n -k Keep input files"
482//usage: "\n -t Test integrity"
479//usage: 483//usage:
480//usage:#define lzcat_trivial_usage 484//usage:#define lzcat_trivial_usage
481//usage: "[FILE]..." 485//usage: "[FILE]..."
@@ -538,7 +542,7 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv)
538//usage: "\n -c Write to stdout" 542//usage: "\n -c Write to stdout"
539//usage: "\n -f Force" 543//usage: "\n -f Force"
540//usage: "\n -k Keep input files" 544//usage: "\n -k Keep input files"
541//usage: "\n -t Test file integrity" 545//usage: "\n -t Test integrity"
542//usage: 546//usage:
543//usage:#define xz_trivial_usage 547//usage:#define xz_trivial_usage
544//usage: "-d [-cfk] [FILE]..." 548//usage: "-d [-cfk] [FILE]..."
@@ -548,7 +552,7 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv)
548//usage: "\n -c Write to stdout" 552//usage: "\n -c Write to stdout"
549//usage: "\n -f Force" 553//usage: "\n -f Force"
550//usage: "\n -k Keep input files" 554//usage: "\n -k Keep input files"
551//usage: "\n -t Test file integrity" 555//usage: "\n -t Test integrity"
552//usage: 556//usage:
553//usage:#define xzcat_trivial_usage 557//usage:#define xzcat_trivial_usage
554//usage: "[FILE]..." 558//usage: "[FILE]..."
diff --git a/archival/bzip2.c b/archival/bzip2.c
index ac5db0880..bce13cf93 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -56,11 +56,13 @@
56//usage: "\n -1..9 Compression level" 56//usage: "\n -1..9 Compression level"
57//usage: IF_FEATURE_BZIP2_DECOMPRESS( 57//usage: IF_FEATURE_BZIP2_DECOMPRESS(
58//usage: "\n -d Decompress" 58//usage: "\n -d Decompress"
59//usage: "\n -t Test file integrity"
60//usage: ) 59//usage: )
61//usage: "\n -c Write to stdout" 60//usage: "\n -c Write to stdout"
62//usage: "\n -f Force" 61//usage: "\n -f Force"
63//usage: "\n -k Keep input files" 62//usage: "\n -k Keep input files"
63//usage: IF_FEATURE_BZIP2_DECOMPRESS(
64//usage: "\n -t Test integrity"
65//usage: )
64 66
65#include "libbb.h" 67#include "libbb.h"
66#include "bb_archive.h" 68#include "bb_archive.h"
diff --git a/archival/gzip.c b/archival/gzip.c
index d9c730f13..91bd4d09d 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -77,11 +77,13 @@ aa: 85.1% -- replaced with aa.gz
77//usage: ) 77//usage: )
78//usage: IF_FEATURE_GZIP_DECOMPRESS( 78//usage: IF_FEATURE_GZIP_DECOMPRESS(
79//usage: "\n -d Decompress" 79//usage: "\n -d Decompress"
80//usage: "\n -t Test file integrity"
81//usage: ) 80//usage: )
82//usage: "\n -c Write to stdout" 81//usage: "\n -c Write to stdout"
83//usage: "\n -f Force" 82//usage: "\n -f Force"
84//usage: "\n -k Keep input files" 83//usage: "\n -k Keep input files"
84//usage: IF_FEATURE_GZIP_DECOMPRESS(
85//usage: "\n -t Test integrity"
86//usage: )
85//usage: 87//usage:
86//usage:#define gzip_example_usage 88//usage:#define gzip_example_usage
87//usage: "$ ls -la /tmp/busybox*\n" 89//usage: "$ ls -la /tmp/busybox*\n"
diff --git a/archival/libarchive/decompress_unlzma.c b/archival/libarchive/decompress_unlzma.c
index 0744f231a..fb5aac8fe 100644
--- a/archival/libarchive/decompress_unlzma.c
+++ b/archival/libarchive/decompress_unlzma.c
@@ -290,8 +290,11 @@ unpack_lzma_stream(transformer_state_t *xstate)
290 uint32_t pos; 290 uint32_t pos;
291 291
292 pos = buffer_pos - rep0; 292 pos = buffer_pos - rep0;
293 if ((int32_t)pos < 0) 293 if ((int32_t)pos < 0) {
294 pos += header.dict_size; 294 pos += header.dict_size;
295 if ((int32_t)pos < 0)
296 goto bad;
297 }
295 match_byte = buffer[pos]; 298 match_byte = buffer[pos];
296 do { 299 do {
297 int bit; 300 int bit;
diff --git a/archival/libarchive/get_header_cpio.c b/archival/libarchive/get_header_cpio.c
index 4ad174732..9ad0557c2 100644
--- a/archival/libarchive/get_header_cpio.c
+++ b/archival/libarchive/get_header_cpio.c
@@ -20,7 +20,7 @@ typedef struct hardlinks_t {
20char FAST_FUNC get_header_cpio(archive_handle_t *archive_handle) 20char FAST_FUNC get_header_cpio(archive_handle_t *archive_handle)
21{ 21{
22 file_header_t *file_header = archive_handle->file_header; 22 file_header_t *file_header = archive_handle->file_header;
23 char cpio_header[110]; 23 char cpio_header[111];
24 int namesize; 24 int namesize;
25 int major, minor, nlink, mode, inode; 25 int major, minor, nlink, mode, inode;
26 unsigned size, uid, gid, mtime; 26 unsigned size, uid, gid, mtime;
@@ -43,6 +43,7 @@ char FAST_FUNC get_header_cpio(archive_handle_t *archive_handle)
43 bb_simple_error_msg_and_die("unsupported cpio format, use newc or crc"); 43 bb_simple_error_msg_and_die("unsupported cpio format, use newc or crc");
44 } 44 }
45 45
46 cpio_header[110] = '\0'; /* sscanf may call strlen which may break without this */
46 if (sscanf(cpio_header + 6, 47 if (sscanf(cpio_header + 6,
47 "%8x" "%8x" "%8x" "%8x" 48 "%8x" "%8x" "%8x" "%8x"
48 "%8x" "%8x" "%8x" /*maj,min:*/ "%*16c" 49 "%8x" "%8x" "%8x" /*maj,min:*/ "%*16c"
diff --git a/archival/lzop.c b/archival/lzop.c
index bdd21598c..74df8ff03 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -86,6 +86,7 @@
86//usage: "\n -f Force" 86//usage: "\n -f Force"
87//usage: "\n -U Delete input files" 87//usage: "\n -U Delete input files"
88///////: "\n -k Keep input files" (default, so why bother documenting?) 88///////: "\n -k Keep input files" (default, so why bother documenting?)
89//usage: "\n -t Test integrity"
89//usage: "\n -v Verbose" 90//usage: "\n -v Verbose"
90//usage: "\n -F Don't verify checksum" 91//usage: "\n -F Don't verify checksum"
91 92
diff --git a/archival/tar.c b/archival/tar.c
index 3b8777414..8cd371173 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -796,7 +796,7 @@ static llist_t *append_file_list_to_list(llist_t *list)
796//usage: IF_FEATURE_TAR_NOPRESERVE_TIME("m") 796//usage: IF_FEATURE_TAR_NOPRESERVE_TIME("m")
797//usage: "vokO] " 797//usage: "vokO] "
798//usage: "[-f TARFILE] [-C DIR] " 798//usage: "[-f TARFILE] [-C DIR] "
799//usage: IF_FEATURE_TAR_FROM("[-T FILE] [-X FILE] "IF_FEATURE_TAR_LONG_OPTIONS("[OPTION]... ")) 799//usage: IF_FEATURE_TAR_FROM("[-T FILE] [-X FILE] "IF_FEATURE_TAR_LONG_OPTIONS("[LONGOPT]... "))
800//usage: "[FILE]..." 800//usage: "[FILE]..."
801//usage:#define tar_full_usage "\n\n" 801//usage:#define tar_full_usage "\n\n"
802//usage: IF_FEATURE_TAR_CREATE("Create, extract, ") 802//usage: IF_FEATURE_TAR_CREATE("Create, extract, ")
diff --git a/archival/unzip.c b/archival/unzip.c
index e02cf33e3..edfd73652 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -56,14 +56,14 @@
56//kbuild:lib-$(CONFIG_UNZIP) += unzip.o 56//kbuild:lib-$(CONFIG_UNZIP) += unzip.o
57 57
58//usage:#define unzip_trivial_usage 58//usage:#define unzip_trivial_usage
59//usage: "[-lnojpq] FILE[.zip] [FILE]... [-x FILE...] [-d DIR]" 59//usage: "[-lnojpq] FILE[.zip] [FILE]... [-x FILE]... [-d DIR]"
60//usage:#define unzip_full_usage "\n\n" 60//usage:#define unzip_full_usage "\n\n"
61//usage: "Extract FILEs from ZIP archive\n" 61//usage: "Extract FILEs from ZIP archive\n"
62//usage: "\n -l List contents (with -q for short form)" 62//usage: "\n -l List contents (with -q for short form)"
63//usage: "\n -n Never overwrite files (default: ask)" 63//usage: "\n -n Never overwrite files (default: ask)"
64//usage: "\n -o Overwrite" 64//usage: "\n -o Overwrite"
65//usage: "\n -j Do not restore paths" 65//usage: "\n -j Do not restore paths"
66//usage: "\n -p Print to stdout" 66//usage: "\n -p Write to stdout"
67//usage: "\n -t Test" 67//usage: "\n -t Test"
68//usage: "\n -q Quiet" 68//usage: "\n -q Quiet"
69//usage: "\n -x FILE Exclude FILEs" 69//usage: "\n -x FILE Exclude FILEs"
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-17 03:02:58 +0000