aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2012-03-22 15:41:00 +0000
committerRon Yorston <rmy@pobox.com>2012-03-22 15:41:00 +0000
commit1118c95535ea51961437089fc3dece5ab4ea7e1b (patch)
tree1515bd2376a6d6c5123791662307ce2ed90cdf36 /archival
parent0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2 (diff)
parent066f39956641300c1e5c6bfe6c11a115cea3e2cf (diff)
downloadbusybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.gz
busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.bz2
busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.zip
Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into merge
Conflicts: procps/ps.c
Diffstat (limited to 'archival')
-rw-r--r--archival/ar.c1
-rw-r--r--archival/bbunzip.c7
-rw-r--r--archival/bzip2.c1
-rw-r--r--archival/cpio.c1
-rw-r--r--archival/dpkg.c1
-rw-r--r--archival/dpkg_deb.c1
-rw-r--r--archival/gzip.c1
-rw-r--r--archival/lzop.c6
-rw-r--r--archival/rpm.c1
-rw-r--r--archival/tar.c1
-rw-r--r--archival/unzip.c1
11 files changed, 2 insertions, 20 deletions
diff --git a/archival/ar.c b/archival/ar.c
index e7973af94..acad20ff2 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -21,7 +21,6 @@
21//usage: "[-o] [-v] [-p] [-t] [-x] ARCHIVE FILES" 21//usage: "[-o] [-v] [-p] [-t] [-x] ARCHIVE FILES"
22//usage:#define ar_full_usage "\n\n" 22//usage:#define ar_full_usage "\n\n"
23//usage: "Extract or list FILES from an ar archive\n" 23//usage: "Extract or list FILES from an ar archive\n"
24//usage: "\nOptions:"
25//usage: "\n -o Preserve original dates" 24//usage: "\n -o Preserve original dates"
26//usage: "\n -p Extract to stdout" 25//usage: "\n -p Extract to stdout"
27//usage: "\n -t List" 26//usage: "\n -t List"
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index f1829db05..0b0d84994 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -174,7 +174,6 @@ char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext)
174//usage: "[-cf] [FILE]..." 174//usage: "[-cf] [FILE]..."
175//usage:#define uncompress_full_usage "\n\n" 175//usage:#define uncompress_full_usage "\n\n"
176//usage: "Decompress .Z file[s]\n" 176//usage: "Decompress .Z file[s]\n"
177//usage: "\nOptions:"
178//usage: "\n -c Write to stdout" 177//usage: "\n -c Write to stdout"
179//usage: "\n -f Overwrite" 178//usage: "\n -f Overwrite"
180 179
@@ -234,7 +233,6 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
234//usage: "[-cft] [FILE]..." 233//usage: "[-cft] [FILE]..."
235//usage:#define gunzip_full_usage "\n\n" 234//usage:#define gunzip_full_usage "\n\n"
236//usage: "Decompress FILEs (or stdin)\n" 235//usage: "Decompress FILEs (or stdin)\n"
237//usage: "\nOptions:"
238//usage: "\n -c Write to stdout" 236//usage: "\n -c Write to stdout"
239//usage: "\n -f Force" 237//usage: "\n -f Force"
240//usage: "\n -t Test file integrity" 238//usage: "\n -t Test file integrity"
@@ -341,7 +339,6 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
341//usage: "[-cf] [FILE]..." 339//usage: "[-cf] [FILE]..."
342//usage:#define bunzip2_full_usage "\n\n" 340//usage:#define bunzip2_full_usage "\n\n"
343//usage: "Decompress FILEs (or stdin)\n" 341//usage: "Decompress FILEs (or stdin)\n"
344//usage: "\nOptions:"
345//usage: "\n -c Write to stdout" 342//usage: "\n -c Write to stdout"
346//usage: "\n -f Force" 343//usage: "\n -f Force"
347//usage:#define bzcat_trivial_usage 344//usage:#define bzcat_trivial_usage
@@ -382,7 +379,6 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
382//usage: "[-cf] [FILE]..." 379//usage: "[-cf] [FILE]..."
383//usage:#define unlzma_full_usage "\n\n" 380//usage:#define unlzma_full_usage "\n\n"
384//usage: "Decompress FILE (or stdin)\n" 381//usage: "Decompress FILE (or stdin)\n"
385//usage: "\nOptions:"
386//usage: "\n -c Write to stdout" 382//usage: "\n -c Write to stdout"
387//usage: "\n -f Force" 383//usage: "\n -f Force"
388//usage: 384//usage:
@@ -390,7 +386,6 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
390//usage: "-d [-cf] [FILE]..." 386//usage: "-d [-cf] [FILE]..."
391//usage:#define lzma_full_usage "\n\n" 387//usage:#define lzma_full_usage "\n\n"
392//usage: "Decompress FILE (or stdin)\n" 388//usage: "Decompress FILE (or stdin)\n"
393//usage: "\nOptions:"
394//usage: "\n -d Decompress" 389//usage: "\n -d Decompress"
395//usage: "\n -c Write to stdout" 390//usage: "\n -c Write to stdout"
396//usage: "\n -f Force" 391//usage: "\n -f Force"
@@ -404,7 +399,6 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
404//usage: "[-cf] [FILE]..." 399//usage: "[-cf] [FILE]..."
405//usage:#define unxz_full_usage "\n\n" 400//usage:#define unxz_full_usage "\n\n"
406//usage: "Decompress FILE (or stdin)\n" 401//usage: "Decompress FILE (or stdin)\n"
407//usage: "\nOptions:"
408//usage: "\n -c Write to stdout" 402//usage: "\n -c Write to stdout"
409//usage: "\n -f Force" 403//usage: "\n -f Force"
410//usage: 404//usage:
@@ -412,7 +406,6 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
412//usage: "-d [-cf] [FILE]..." 406//usage: "-d [-cf] [FILE]..."
413//usage:#define xz_full_usage "\n\n" 407//usage:#define xz_full_usage "\n\n"
414//usage: "Decompress FILE (or stdin)\n" 408//usage: "Decompress FILE (or stdin)\n"
415//usage: "\nOptions:"
416//usage: "\n -d Decompress" 409//usage: "\n -d Decompress"
417//usage: "\n -c Write to stdout" 410//usage: "\n -c Write to stdout"
418//usage: "\n -f Force" 411//usage: "\n -f Force"
diff --git a/archival/bzip2.c b/archival/bzip2.c
index cfaf5fe20..e39d7f704 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -11,7 +11,6 @@
11//usage: "[OPTIONS] [FILE]..." 11//usage: "[OPTIONS] [FILE]..."
12//usage:#define bzip2_full_usage "\n\n" 12//usage:#define bzip2_full_usage "\n\n"
13//usage: "Compress FILEs (or stdin) with bzip2 algorithm\n" 13//usage: "Compress FILEs (or stdin) with bzip2 algorithm\n"
14//usage: "\nOptions:"
15//usage: "\n -1..9 Compression level" 14//usage: "\n -1..9 Compression level"
16//usage: "\n -d Decompress" 15//usage: "\n -d Decompress"
17//usage: "\n -c Write to stdout" 16//usage: "\n -c Write to stdout"
diff --git a/archival/cpio.c b/archival/cpio.c
index c746a71fa..9674a046b 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -34,7 +34,6 @@
34//usage: IF_FEATURE_CPIO_P( 34//usage: IF_FEATURE_CPIO_P(
35//usage: "\n -p DIR Copy files to DIR" 35//usage: "\n -p DIR Copy files to DIR"
36//usage: ) 36//usage: )
37//usage: "\nOptions:"
38//usage: "\n -d Make leading directories" 37//usage: "\n -d Make leading directories"
39//usage: "\n -m Preserve mtime" 38//usage: "\n -m Preserve mtime"
40//usage: "\n -v Verbose" 39//usage: "\n -v Verbose"
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 8899d1719..2a6a7b3bf 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -32,7 +32,6 @@
32//usage: "[-ilCPru] [-F OPT] PACKAGE" 32//usage: "[-ilCPru] [-F OPT] PACKAGE"
33//usage:#define dpkg_full_usage "\n\n" 33//usage:#define dpkg_full_usage "\n\n"
34//usage: "Install, remove and manage Debian packages\n" 34//usage: "Install, remove and manage Debian packages\n"
35//usage: "\nOptions:"
36//usage: IF_LONG_OPTS( 35//usage: IF_LONG_OPTS(
37//usage: "\n -i,--install Install the package" 36//usage: "\n -i,--install Install the package"
38//usage: "\n -l,--list List of installed packages" 37//usage: "\n -l,--list List of installed packages"
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 9e1e811ee..5d814d7ef 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -9,7 +9,6 @@
9//usage: "[-cefxX] FILE [argument" 9//usage: "[-cefxX] FILE [argument"
10//usage:#define dpkg_deb_full_usage "\n\n" 10//usage:#define dpkg_deb_full_usage "\n\n"
11//usage: "Perform actions on Debian packages (.debs)\n" 11//usage: "Perform actions on Debian packages (.debs)\n"
12//usage: "\nOptions:"
13//usage: "\n -c List contents of filesystem tree" 12//usage: "\n -c List contents of filesystem tree"
14//usage: "\n -e Extract control files to [argument] directory" 13//usage: "\n -e Extract control files to [argument] directory"
15//usage: "\n -f Display control field name starting with [argument]" 14//usage: "\n -f Display control field name starting with [argument]"
diff --git a/archival/gzip.c b/archival/gzip.c
index b2f9b2dc2..507f5b151 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -43,7 +43,6 @@ aa: 85.1% -- replaced with aa.gz
43//usage: "[-cfd] [FILE]..." 43//usage: "[-cfd] [FILE]..."
44//usage:#define gzip_full_usage "\n\n" 44//usage:#define gzip_full_usage "\n\n"
45//usage: "Compress FILEs (or stdin)\n" 45//usage: "Compress FILEs (or stdin)\n"
46//usage: "\nOptions:"
47//usage: "\n -d Decompress" 46//usage: "\n -d Decompress"
48//usage: "\n -c Write to stdout" 47//usage: "\n -c Write to stdout"
49//usage: "\n -f Force" 48//usage: "\n -f Force"
diff --git a/archival/lzop.c b/archival/lzop.c
index f4419910f..1326bd790 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -28,8 +28,7 @@
28//usage:#define lzop_trivial_usage 28//usage:#define lzop_trivial_usage
29//usage: "[-cfvd123456789CF] [FILE]..." 29//usage: "[-cfvd123456789CF] [FILE]..."
30//usage:#define lzop_full_usage "\n\n" 30//usage:#define lzop_full_usage "\n\n"
31//usage: "Options:" 31//usage: " -1..9 Compression level"
32//usage: "\n -1..9 Compression level"
33//usage: "\n -d Decompress" 32//usage: "\n -d Decompress"
34//usage: "\n -c Write to stdout" 33//usage: "\n -c Write to stdout"
35//usage: "\n -f Force" 34//usage: "\n -f Force"
@@ -46,8 +45,7 @@
46//usage:#define unlzop_trivial_usage 45//usage:#define unlzop_trivial_usage
47//usage: "[-cfvCF] [FILE]..." 46//usage: "[-cfvCF] [FILE]..."
48//usage:#define unlzop_full_usage "\n\n" 47//usage:#define unlzop_full_usage "\n\n"
49//usage: "Options:" 48//usage: " -c Write to stdout"
50//usage: "\n -c Write to stdout"
51//usage: "\n -f Force" 49//usage: "\n -f Force"
52//usage: "\n -v Verbose" 50//usage: "\n -v Verbose"
53//usage: "\n -F Don't store or verify checksum" 51//usage: "\n -F Don't store or verify checksum"
diff --git a/archival/rpm.c b/archival/rpm.c
index 98a45d9cc..8174f4869 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -14,7 +14,6 @@
14//usage: "\nCommands:" 14//usage: "\nCommands:"
15//usage: "\n -i Install package" 15//usage: "\n -i Install package"
16//usage: "\n -qp Query package" 16//usage: "\n -qp Query package"
17//usage: "\nOptions:"
18//usage: "\n -i Show information" 17//usage: "\n -i Show information"
19//usage: "\n -l List contents" 18//usage: "\n -l List contents"
20//usage: "\n -d List documents" 19//usage: "\n -d List documents"
diff --git a/archival/tar.c b/archival/tar.c
index fca2d068b..612b2119b 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -761,7 +761,6 @@ static void handle_SIGCHLD(int status)
761//usage: ) 761//usage: )
762//usage: "\n x Extract" 762//usage: "\n x Extract"
763//usage: "\n t List" 763//usage: "\n t List"
764//usage: "\nOptions:"
765//usage: "\n f Name of TARFILE ('-' for stdin/out)" 764//usage: "\n f Name of TARFILE ('-' for stdin/out)"
766//usage: "\n C Change to DIR before operation" 765//usage: "\n C Change to DIR before operation"
767//usage: "\n v Verbose" 766//usage: "\n v Verbose"
diff --git a/archival/unzip.c b/archival/unzip.c
index 52b0a6414..4fa729326 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -23,7 +23,6 @@
23//usage: "[-opts[modifiers]] FILE[.zip] [LIST] [-x XLIST] [-d DIR]" 23//usage: "[-opts[modifiers]] FILE[.zip] [LIST] [-x XLIST] [-d DIR]"
24//usage:#define unzip_full_usage "\n\n" 24//usage:#define unzip_full_usage "\n\n"
25//usage: "Extract files from ZIP archives\n" 25//usage: "Extract files from ZIP archives\n"
26//usage: "\nOptions:"
27//usage: "\n -l List archive contents (with -q for short form)" 26//usage: "\n -l List archive contents (with -q for short form)"
28//usage: "\n -n Never overwrite files (default)" 27//usage: "\n -n Never overwrite files (default)"
29//usage: "\n -o Overwrite" 28//usage: "\n -o Overwrite"
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-11 16:09:44 +0000