summaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
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 027cd6b..f4edeb0 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -16,7 +16,6 @@
* between different systems
* http://www.unix-systems.org/single_unix_specification_v2/xcu/ar.html
*/
-
//config:config AR
//config: bool "ar (9.5 kb)"
//config: default n # needs to be improved to be able to replace binutils ar
@@ -46,6 +45,7 @@
//config: This enables archive creation (-c and -r) with busybox ar.
//applet:IF_AR(APPLET(ar, BB_DIR_USR_BIN, BB_SUID_DROP))
+
//kbuild:lib-$(CONFIG_AR) += ar.o
//usage:#define ar_trivial_usage
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 20ab893..944b397 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -4,9 +4,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-#include "libbb.h"
-#include "bb_archive.h"
-
//kbuild:lib-$(CONFIG_ZCAT) += bbunzip.o
//kbuild:lib-$(CONFIG_GUNZIP) += bbunzip.o
//kbuild:lib-$(CONFIG_BZCAT) += bbunzip.o
@@ -21,6 +18,9 @@
/* gzip_main() too: */
//kbuild:lib-$(CONFIG_GZIP) += bbunzip.o
+#include "libbb.h"
+#include "bb_archive.h"
+
/* Note: must be kept in sync with archival/lzop.c */
enum {
OPT_STDOUT = 1 << 0,
diff --git a/archival/bzip2.c b/archival/bzip2.c
index d578eb7..d6fd929 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -6,7 +6,6 @@
* See README and LICENSE files in bz/ directory for more information
* about bzip2 library code.
*/
-
//config:config BZIP2
//config: bool "bzip2 (18 kb)"
//config: default y
@@ -30,6 +29,7 @@
//config: enabled.
//applet:IF_BZIP2(APPLET(bzip2, BB_DIR_USR_BIN, BB_SUID_DROP))
+
//kbuild:lib-$(CONFIG_BZIP2) += bzip2.o
//usage:#define bzip2_trivial_usage
diff --git a/archival/cpio.c b/archival/cpio.c
index f2165be..1d6cbd1 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -10,10 +10,6 @@
* Doesn't check CRC's
* Only supports new ASCII and CRC formats
*/
-#include "libbb.h"
-#include "common_bufsiz.h"
-#include "bb_archive.h"
-
//config:config CPIO
//config: bool "cpio (14 kb)"
//config: default y
@@ -44,6 +40,7 @@
//config: Passthrough mode. Rarely used.
//applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
+
//kbuild:lib-$(CONFIG_CPIO) += cpio.o
//usage:#define cpio_trivial_usage
@@ -142,6 +139,10 @@
-u, --unconditional Replace all files unconditionally
*/
+#include "libbb.h"
+#include "common_bufsiz.h"
+#include "bb_archive.h"
+
enum {
OPT_EXTRACT = (1 << 0),
OPT_TEST = (1 << 1),
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 852e0ca..58bc4db 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -25,7 +25,6 @@
* bugs that need to be fixed
* - (unknown, please let me know when you find any)
*/
-
//config:config DPKG
//config: bool "dpkg (44 kb)"
//config: default y
@@ -38,6 +37,7 @@
//config: you should use the official dpkg if possible.
//applet:IF_DPKG(APPLET(dpkg, BB_DIR_USR_BIN, BB_SUID_DROP))
+
//kbuild:lib-$(CONFIG_DPKG) += dpkg.o
//usage:#define dpkg_trivial_usage
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index f6bf9eb..dc4738d 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -4,7 +4,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
//config:config DPKG_DEB
//config: bool "dpkg_deb"
//config: default y
diff --git a/archival/gzip.c b/archival/gzip.c
index 9c53895..ac66330 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -36,7 +36,6 @@ a: 85.1% -- replaced with a.gz
gzip: bogus: No such file or directory
aa: 85.1% -- replaced with aa.gz
*/
-
//config:config GZIP
//config: bool "gzip (19 kb)"
//config: default y
@@ -81,6 +80,7 @@ aa: 85.1% -- replaced with aa.gz
//config: enabled.
//applet:IF_GZIP(APPLET(gzip, BB_DIR_BIN, BB_SUID_DROP))
+
//kbuild:lib-$(CONFIG_GZIP) += gzip.o
//usage:#define gzip_trivial_usage
diff --git a/archival/lzop.c b/archival/lzop.c
index 1bf954f..92411c2 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -24,7 +24,6 @@
"Minimalized" for busybox by Alain Knaff
*/
-
//config:config LZOP
//config: bool "lzop (13 kb)"
//config: default y
@@ -56,6 +55,7 @@
// APPLET_ODDNAME:name main location suid_type help
//applet:IF_UNLZOP( APPLET_ODDNAME(unlzop, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, unlzop))
//applet:IF_LZOPCAT(APPLET_ODDNAME(lzopcat, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, lzopcat))
+
//kbuild:lib-$(CONFIG_LZOP) += lzop.o
//kbuild:lib-$(CONFIG_UNLZOP) += lzop.o
//kbuild:lib-$(CONFIG_LZOPCAT) += lzop.o
diff --git a/archival/tar.c b/archival/tar.c
index 6cf3508..b6d5129 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -22,7 +22,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
//config:config TAR
//config: bool "tar (40 kb)"
//config: default y
@@ -113,6 +112,7 @@
//config: when extracting files from tar archives.
//applet:IF_TAR(APPLET(tar, BB_DIR_BIN, BB_SUID_DROP))
+
//kbuild:lib-$(CONFIG_TAR) += tar.o
#include <fnmatch.h>