aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-09-18 16:28:43 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2017-09-18 16:28:43 +0200
commit0c4dbd481aedb5d22c1048e7f7eb547a3b5e50a5 (patch)
treecfe1328d742da3f0572ac8b2f06aa95259862ac5 /archival
parentb63afead4411c5832d427ed149683c85cc81a4c9 (diff)
downloadbusybox-w32-0c4dbd481aedb5d22c1048e7f7eb547a3b5e50a5.tar.gz
busybox-w32-0c4dbd481aedb5d22c1048e7f7eb547a3b5e50a5.tar.bz2
busybox-w32-0c4dbd481aedb5d22c1048e7f7eb547a3b5e50a5.zip
regularize format of source file headers, no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival')
-rw-r--r--archival/ar.c2
-rw-r--r--archival/bbunzip.c6
-rw-r--r--archival/bzip2.c2
-rw-r--r--archival/cpio.c9
-rw-r--r--archival/dpkg.c2
-rw-r--r--archival/dpkg_deb.c1
-rw-r--r--archival/gzip.c2
-rw-r--r--archival/lzop.c2
-rw-r--r--archival/tar.c2
9 files changed, 14 insertions, 14 deletions
diff --git a/archival/ar.c b/archival/ar.c
index 027cd6b5a..f4edeb087 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -16,7 +16,6 @@
16 * between different systems 16 * between different systems
17 * http://www.unix-systems.org/single_unix_specification_v2/xcu/ar.html 17 * http://www.unix-systems.org/single_unix_specification_v2/xcu/ar.html
18 */ 18 */
19
20//config:config AR 19//config:config AR
21//config: bool "ar (9.5 kb)" 20//config: bool "ar (9.5 kb)"
22//config: default n # needs to be improved to be able to replace binutils ar 21//config: default n # needs to be improved to be able to replace binutils ar
@@ -46,6 +45,7 @@
46//config: This enables archive creation (-c and -r) with busybox ar. 45//config: This enables archive creation (-c and -r) with busybox ar.
47 46
48//applet:IF_AR(APPLET(ar, BB_DIR_USR_BIN, BB_SUID_DROP)) 47//applet:IF_AR(APPLET(ar, BB_DIR_USR_BIN, BB_SUID_DROP))
48
49//kbuild:lib-$(CONFIG_AR) += ar.o 49//kbuild:lib-$(CONFIG_AR) += ar.o
50 50
51//usage:#define ar_trivial_usage 51//usage:#define ar_trivial_usage
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 20ab893da..944b397b3 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -4,9 +4,6 @@
4 * 4 *
5 * Licensed under GPLv2 or later, see file LICENSE in this source tree. 5 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
6 */ 6 */
7#include "libbb.h"
8#include "bb_archive.h"
9
10//kbuild:lib-$(CONFIG_ZCAT) += bbunzip.o 7//kbuild:lib-$(CONFIG_ZCAT) += bbunzip.o
11//kbuild:lib-$(CONFIG_GUNZIP) += bbunzip.o 8//kbuild:lib-$(CONFIG_GUNZIP) += bbunzip.o
12//kbuild:lib-$(CONFIG_BZCAT) += bbunzip.o 9//kbuild:lib-$(CONFIG_BZCAT) += bbunzip.o
@@ -21,6 +18,9 @@
21/* gzip_main() too: */ 18/* gzip_main() too: */
22//kbuild:lib-$(CONFIG_GZIP) += bbunzip.o 19//kbuild:lib-$(CONFIG_GZIP) += bbunzip.o
23 20
21#include "libbb.h"
22#include "bb_archive.h"
23
24/* Note: must be kept in sync with archival/lzop.c */ 24/* Note: must be kept in sync with archival/lzop.c */
25enum { 25enum {
26 OPT_STDOUT = 1 << 0, 26 OPT_STDOUT = 1 << 0,
diff --git a/archival/bzip2.c b/archival/bzip2.c
index d578eb7ad..d6fd9296d 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -6,7 +6,6 @@
6 * See README and LICENSE files in bz/ directory for more information 6 * See README and LICENSE files in bz/ directory for more information
7 * about bzip2 library code. 7 * about bzip2 library code.
8 */ 8 */
9
10//config:config BZIP2 9//config:config BZIP2
11//config: bool "bzip2 (18 kb)" 10//config: bool "bzip2 (18 kb)"
12//config: default y 11//config: default y
@@ -30,6 +29,7 @@
30//config: enabled. 29//config: enabled.
31 30
32//applet:IF_BZIP2(APPLET(bzip2, BB_DIR_USR_BIN, BB_SUID_DROP)) 31//applet:IF_BZIP2(APPLET(bzip2, BB_DIR_USR_BIN, BB_SUID_DROP))
32
33//kbuild:lib-$(CONFIG_BZIP2) += bzip2.o 33//kbuild:lib-$(CONFIG_BZIP2) += bzip2.o
34 34
35//usage:#define bzip2_trivial_usage 35//usage:#define bzip2_trivial_usage
diff --git a/archival/cpio.c b/archival/cpio.c
index f2165be3a..1d6cbd1e2 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -10,10 +10,6 @@
10 * Doesn't check CRC's 10 * Doesn't check CRC's
11 * Only supports new ASCII and CRC formats 11 * Only supports new ASCII and CRC formats
12 */ 12 */
13#include "libbb.h"
14#include "common_bufsiz.h"
15#include "bb_archive.h"
16
17//config:config CPIO 13//config:config CPIO
18//config: bool "cpio (14 kb)" 14//config: bool "cpio (14 kb)"
19//config: default y 15//config: default y
@@ -44,6 +40,7 @@
44//config: Passthrough mode. Rarely used. 40//config: Passthrough mode. Rarely used.
45 41
46//applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP)) 42//applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
43
47//kbuild:lib-$(CONFIG_CPIO) += cpio.o 44//kbuild:lib-$(CONFIG_CPIO) += cpio.o
48 45
49//usage:#define cpio_trivial_usage 46//usage:#define cpio_trivial_usage
@@ -142,6 +139,10 @@
142 -u, --unconditional Replace all files unconditionally 139 -u, --unconditional Replace all files unconditionally
143 */ 140 */
144 141
142#include "libbb.h"
143#include "common_bufsiz.h"
144#include "bb_archive.h"
145
145enum { 146enum {
146 OPT_EXTRACT = (1 << 0), 147 OPT_EXTRACT = (1 << 0),
147 OPT_TEST = (1 << 1), 148 OPT_TEST = (1 << 1),
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 852e0cac2..58bc4dba3 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -25,7 +25,6 @@
25 * bugs that need to be fixed 25 * bugs that need to be fixed
26 * - (unknown, please let me know when you find any) 26 * - (unknown, please let me know when you find any)
27 */ 27 */
28
29//config:config DPKG 28//config:config DPKG
30//config: bool "dpkg (44 kb)" 29//config: bool "dpkg (44 kb)"
31//config: default y 30//config: default y
@@ -38,6 +37,7 @@
38//config: you should use the official dpkg if possible. 37//config: you should use the official dpkg if possible.
39 38
40//applet:IF_DPKG(APPLET(dpkg, BB_DIR_USR_BIN, BB_SUID_DROP)) 39//applet:IF_DPKG(APPLET(dpkg, BB_DIR_USR_BIN, BB_SUID_DROP))
40
41//kbuild:lib-$(CONFIG_DPKG) += dpkg.o 41//kbuild:lib-$(CONFIG_DPKG) += dpkg.o
42 42
43//usage:#define dpkg_trivial_usage 43//usage:#define dpkg_trivial_usage
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index f6bf9eb04..dc4738d28 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -4,7 +4,6 @@
4 * 4 *
5 * Licensed under GPLv2 or later, see file LICENSE in this source tree. 5 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
6 */ 6 */
7
8//config:config DPKG_DEB 7//config:config DPKG_DEB
9//config: bool "dpkg_deb" 8//config: bool "dpkg_deb"
10//config: default y 9//config: default y
diff --git a/archival/gzip.c b/archival/gzip.c
index 9c53895e9..ac6633044 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -36,7 +36,6 @@ a: 85.1% -- replaced with a.gz
36gzip: bogus: No such file or directory 36gzip: bogus: No such file or directory
37aa: 85.1% -- replaced with aa.gz 37aa: 85.1% -- replaced with aa.gz
38*/ 38*/
39
40//config:config GZIP 39//config:config GZIP
41//config: bool "gzip (19 kb)" 40//config: bool "gzip (19 kb)"
42//config: default y 41//config: default y
@@ -81,6 +80,7 @@ aa: 85.1% -- replaced with aa.gz
81//config: enabled. 80//config: enabled.
82 81
83//applet:IF_GZIP(APPLET(gzip, BB_DIR_BIN, BB_SUID_DROP)) 82//applet:IF_GZIP(APPLET(gzip, BB_DIR_BIN, BB_SUID_DROP))
83
84//kbuild:lib-$(CONFIG_GZIP) += gzip.o 84//kbuild:lib-$(CONFIG_GZIP) += gzip.o
85 85
86//usage:#define gzip_trivial_usage 86//usage:#define gzip_trivial_usage
diff --git a/archival/lzop.c b/archival/lzop.c
index 1bf954f4f..92411c23f 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -24,7 +24,6 @@
24 24
25 "Minimalized" for busybox by Alain Knaff 25 "Minimalized" for busybox by Alain Knaff
26*/ 26*/
27
28//config:config LZOP 27//config:config LZOP
29//config: bool "lzop (13 kb)" 28//config: bool "lzop (13 kb)"
30//config: default y 29//config: default y
@@ -56,6 +55,7 @@
56// APPLET_ODDNAME:name main location suid_type help 55// APPLET_ODDNAME:name main location suid_type help
57//applet:IF_UNLZOP( APPLET_ODDNAME(unlzop, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, unlzop)) 56//applet:IF_UNLZOP( APPLET_ODDNAME(unlzop, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, unlzop))
58//applet:IF_LZOPCAT(APPLET_ODDNAME(lzopcat, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, lzopcat)) 57//applet:IF_LZOPCAT(APPLET_ODDNAME(lzopcat, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, lzopcat))
58
59//kbuild:lib-$(CONFIG_LZOP) += lzop.o 59//kbuild:lib-$(CONFIG_LZOP) += lzop.o
60//kbuild:lib-$(CONFIG_UNLZOP) += lzop.o 60//kbuild:lib-$(CONFIG_UNLZOP) += lzop.o
61//kbuild:lib-$(CONFIG_LZOPCAT) += lzop.o 61//kbuild:lib-$(CONFIG_LZOPCAT) += lzop.o
diff --git a/archival/tar.c b/archival/tar.c
index 6cf3508ec..b6d5129d8 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -22,7 +22,6 @@
22 * 22 *
23 * Licensed under GPLv2 or later, see file LICENSE in this source tree. 23 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
24 */ 24 */
25
26//config:config TAR 25//config:config TAR
27//config: bool "tar (40 kb)" 26//config: bool "tar (40 kb)"
28//config: default y 27//config: default y
@@ -113,6 +112,7 @@
113//config: when extracting files from tar archives. 112//config: when extracting files from tar archives.
114 113
115//applet:IF_TAR(APPLET(tar, BB_DIR_BIN, BB_SUID_DROP)) 114//applet:IF_TAR(APPLET(tar, BB_DIR_BIN, BB_SUID_DROP))
115
116//kbuild:lib-$(CONFIG_TAR) += tar.o 116//kbuild:lib-$(CONFIG_TAR) += tar.o
117 117
118#include <fnmatch.h> 118#include <fnmatch.h>