diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-05-26 19:00:18 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-05-26 19:00:18 +0000 |
commit | b6adbf1be29841501cc49917249e85f273e1df7c (patch) | |
tree | e28a5603e6009b2479e949b8b9b4aa0620fed400 /util-linux | |
parent | 5a6aeddfa7262e41802c77f70c9ef88e9c2c2476 (diff) | |
download | busybox-w32-b6adbf1be29841501cc49917249e85f273e1df7c.tar.gz busybox-w32-b6adbf1be29841501cc49917249e85f273e1df7c.tar.bz2 busybox-w32-b6adbf1be29841501cc49917249e85f273e1df7c.zip |
usage.c: remove reference to busybox.h
*: s/include "busybox.h"/include "libbb.h"
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/dmesg.c | 2 | ||||
-rw-r--r-- | util-linux/fbset.c | 2 | ||||
-rw-r--r-- | util-linux/fdformat.c | 2 | ||||
-rw-r--r-- | util-linux/fdisk.c | 2 | ||||
-rw-r--r-- | util-linux/freeramdisk.c | 2 | ||||
-rw-r--r-- | util-linux/fsck_minix.c | 2 | ||||
-rw-r--r-- | util-linux/getopt.c | 2 | ||||
-rw-r--r-- | util-linux/hexdump.c | 2 | ||||
-rw-r--r-- | util-linux/hwclock.c | 2 | ||||
-rw-r--r-- | util-linux/ipcrm.c | 2 | ||||
-rw-r--r-- | util-linux/ipcs.c | 2 | ||||
-rw-r--r-- | util-linux/losetup.c | 3 | ||||
-rw-r--r-- | util-linux/mdev.c | 2 | ||||
-rw-r--r-- | util-linux/mkfs_minix.c | 2 | ||||
-rw-r--r-- | util-linux/mkswap.c | 2 | ||||
-rw-r--r-- | util-linux/more.c | 2 | ||||
-rw-r--r-- | util-linux/mount.c | 2 | ||||
-rw-r--r-- | util-linux/pivot_root.c | 2 | ||||
-rw-r--r-- | util-linux/rdate.c | 2 | ||||
-rw-r--r-- | util-linux/readprofile.c | 2 | ||||
-rw-r--r-- | util-linux/setarch.c | 2 | ||||
-rw-r--r-- | util-linux/swaponoff.c | 2 | ||||
-rw-r--r-- | util-linux/switch_root.c | 2 | ||||
-rw-r--r-- | util-linux/umount.c | 2 |
24 files changed, 24 insertions, 25 deletions
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c index 820b837c9..ed908ede9 100644 --- a/util-linux/dmesg.c +++ b/util-linux/dmesg.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * Licensed under GPLv2, see file LICENSE in this tarball for details. | 9 | * Licensed under GPLv2, see file LICENSE in this tarball for details. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "busybox.h" | 12 | #include "libbb.h" |
13 | #include <unistd.h> | 13 | #include <unistd.h> |
14 | #include <sys/klog.h> | 14 | #include <sys/klog.h> |
15 | 15 | ||
diff --git a/util-linux/fbset.c b/util-linux/fbset.c index bd584e460..f963040bd 100644 --- a/util-linux/fbset.c +++ b/util-linux/fbset.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) | 12 | * Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "busybox.h" | 15 | #include "libbb.h" |
16 | 16 | ||
17 | #define DEFAULTFBDEV FB_0 | 17 | #define DEFAULTFBDEV FB_0 |
18 | #define DEFAULTFBMODE "/etc/fb.modes" | 18 | #define DEFAULTFBMODE "/etc/fb.modes" |
diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c index d694bd631..e9fbeee7b 100644 --- a/util-linux/fdformat.c +++ b/util-linux/fdformat.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * 5 July 2003 -- modified for Busybox by Erik Andersen | 9 | * 5 July 2003 -- modified for Busybox by Erik Andersen |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "busybox.h" | 12 | #include "libbb.h" |
13 | 13 | ||
14 | 14 | ||
15 | /* Stuff extracted from linux/fd.h */ | 15 | /* Stuff extracted from linux/fd.h */ |
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index f3c7ca4c6..a1893c66e 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c | |||
@@ -8,7 +8,7 @@ | |||
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <assert.h> /* assert */ | 10 | #include <assert.h> /* assert */ |
11 | #include "busybox.h" | 11 | #include "libbb.h" |
12 | 12 | ||
13 | /* Looks like someone forgot to add this to config system */ | 13 | /* Looks like someone forgot to add this to config system */ |
14 | #ifndef ENABLE_FEATURE_FDISK_BLKSIZE | 14 | #ifndef ENABLE_FEATURE_FDISK_BLKSIZE |
diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c index ae341b066..a1f2c56cf 100644 --- a/util-linux/freeramdisk.c +++ b/util-linux/freeramdisk.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * Licensed under GPLv2, see file LICENSE in this tarball for details. | 9 | * Licensed under GPLv2, see file LICENSE in this tarball for details. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "busybox.h" | 12 | #include "libbb.h" |
13 | 13 | ||
14 | /* From <linux/fd.h> */ | 14 | /* From <linux/fd.h> */ |
15 | #define FDFLUSH _IO(2,0x4b) | 15 | #define FDFLUSH _IO(2,0x4b) |
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index cc73cdd5a..d35a25a9d 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c | |||
@@ -87,7 +87,7 @@ | |||
87 | * enforced (but it's not much fun on a character device :-). | 87 | * enforced (but it's not much fun on a character device :-). |
88 | */ | 88 | */ |
89 | 89 | ||
90 | #include "busybox.h" | 90 | #include "libbb.h" |
91 | #include <mntent.h> | 91 | #include <mntent.h> |
92 | 92 | ||
93 | #include "minix.h" | 93 | #include "minix.h" |
diff --git a/util-linux/getopt.c b/util-linux/getopt.c index 68e69de5c..b4749c199 100644 --- a/util-linux/getopt.c +++ b/util-linux/getopt.c | |||
@@ -31,8 +31,8 @@ | |||
31 | * | 31 | * |
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include "busybox.h" | ||
35 | #include <getopt.h> | 34 | #include <getopt.h> |
35 | #include "libbb.h" | ||
36 | 36 | ||
37 | /* NON_OPT is the code that is returned when a non-option is found in '+' | 37 | /* NON_OPT is the code that is returned when a non-option is found in '+' |
38 | mode */ | 38 | mode */ |
diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c index 85a449038..36ed1e97c 100644 --- a/util-linux/hexdump.c +++ b/util-linux/hexdump.c | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <getopt.h> | 12 | #include <getopt.h> |
13 | #include "busybox.h" | 13 | #include "libbb.h" |
14 | #include "dump.h" | 14 | #include "dump.h" |
15 | 15 | ||
16 | /* This is a NOEXEC applet. Be very careful! */ | 16 | /* This is a NOEXEC applet. Be very careful! */ |
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c index 4ca8eafad..686492578 100644 --- a/util-linux/hwclock.c +++ b/util-linux/hwclock.c | |||
@@ -11,7 +11,7 @@ | |||
11 | #include <sys/ioctl.h> | 11 | #include <sys/ioctl.h> |
12 | #include <sys/utsname.h> | 12 | #include <sys/utsname.h> |
13 | #include <getopt.h> | 13 | #include <getopt.h> |
14 | #include "busybox.h" | 14 | #include "libbb.h" |
15 | 15 | ||
16 | /* Copied from linux/rtc.h to eliminate the kernel dependency */ | 16 | /* Copied from linux/rtc.h to eliminate the kernel dependency */ |
17 | struct linux_rtc_time { | 17 | struct linux_rtc_time { |
diff --git a/util-linux/ipcrm.c b/util-linux/ipcrm.c index 025f527cf..1e6206217 100644 --- a/util-linux/ipcrm.c +++ b/util-linux/ipcrm.c | |||
@@ -8,7 +8,7 @@ | |||
8 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 8 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include "busybox.h" | 11 | #include "libbb.h" |
12 | 12 | ||
13 | /* X/OPEN tells us to use <sys/{types,ipc,sem}.h> for semctl() */ | 13 | /* X/OPEN tells us to use <sys/{types,ipc,sem}.h> for semctl() */ |
14 | /* X/OPEN tells us to use <sys/{types,ipc,msg}.h> for msgctl() */ | 14 | /* X/OPEN tells us to use <sys/{types,ipc,msg}.h> for msgctl() */ |
diff --git a/util-linux/ipcs.c b/util-linux/ipcs.c index 489480c85..393f94832 100644 --- a/util-linux/ipcs.c +++ b/util-linux/ipcs.c | |||
@@ -8,7 +8,7 @@ | |||
8 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 8 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include "busybox.h" | 11 | #include "libbb.h" |
12 | #include <errno.h> | 12 | #include <errno.h> |
13 | #include <time.h> | 13 | #include <time.h> |
14 | #include <pwd.h> | 14 | #include <pwd.h> |
diff --git a/util-linux/losetup.c b/util-linux/losetup.c index b1e4b08b0..e2d4e4d79 100644 --- a/util-linux/losetup.c +++ b/util-linux/losetup.c | |||
@@ -8,9 +8,8 @@ | |||
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <getopt.h> | 10 | #include <getopt.h> |
11 | #include <stdlib.h> | ||
12 | 11 | ||
13 | #include "busybox.h" | 12 | #include "libbb.h" |
14 | 13 | ||
15 | int losetup_main(int argc, char **argv); | 14 | int losetup_main(int argc, char **argv); |
16 | int losetup_main(int argc, char **argv) | 15 | int losetup_main(int argc, char **argv) |
diff --git a/util-linux/mdev.c b/util-linux/mdev.c index 6ff49fc01..a4716e2da 100644 --- a/util-linux/mdev.c +++ b/util-linux/mdev.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * Licensed under GPL version 2, see file LICENSE in this tarball for details. | 9 | * Licensed under GPL version 2, see file LICENSE in this tarball for details. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "busybox.h" | 12 | #include "libbb.h" |
13 | #include "xregex.h" | 13 | #include "xregex.h" |
14 | 14 | ||
15 | #define DEV_PATH "/dev" | 15 | #define DEV_PATH "/dev" |
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index d70d20fda..9707ba3bd 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c | |||
@@ -62,7 +62,7 @@ | |||
62 | * removed getopt based parser and added a hand rolled one. | 62 | * removed getopt based parser and added a hand rolled one. |
63 | */ | 63 | */ |
64 | 64 | ||
65 | #include "busybox.h" | 65 | #include "libbb.h" |
66 | #include <mntent.h> | 66 | #include <mntent.h> |
67 | 67 | ||
68 | #include "minix.h" | 68 | #include "minix.h" |
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c index a84792c66..88f1fbb03 100644 --- a/util-linux/mkswap.c +++ b/util-linux/mkswap.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * Licensed under GPL version 2, see file LICENSE in this tarball for details. | 6 | * Licensed under GPL version 2, see file LICENSE in this tarball for details. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "busybox.h" | 9 | #include "libbb.h" |
10 | 10 | ||
11 | int mkswap_main(int argc, char **argv); | 11 | int mkswap_main(int argc, char **argv); |
12 | int mkswap_main(int argc, char **argv) | 12 | int mkswap_main(int argc, char **argv) |
diff --git a/util-linux/more.c b/util-linux/more.c index 2a38ef326..30ef896bc 100644 --- a/util-linux/more.c +++ b/util-linux/more.c | |||
@@ -14,7 +14,7 @@ | |||
14 | * Licensed under GPLv2 or later, see file License in this tarball for details. | 14 | * Licensed under GPLv2 or later, see file License in this tarball for details. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "busybox.h" | 17 | #include "libbb.h" |
18 | 18 | ||
19 | 19 | ||
20 | #if ENABLE_FEATURE_USE_TERMIOS | 20 | #if ENABLE_FEATURE_USE_TERMIOS |
diff --git a/util-linux/mount.c b/util-linux/mount.c index 030ea662a..fe2f1d969 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c | |||
@@ -18,7 +18,7 @@ | |||
18 | mount_it_now() does the actual mount. | 18 | mount_it_now() does the actual mount. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include "busybox.h" | 21 | #include "libbb.h" |
22 | #include <mntent.h> | 22 | #include <mntent.h> |
23 | 23 | ||
24 | /* Needed for nfs support only... */ | 24 | /* Needed for nfs support only... */ |
diff --git a/util-linux/pivot_root.c b/util-linux/pivot_root.c index 2706bd2ff..929ed30db 100644 --- a/util-linux/pivot_root.c +++ b/util-linux/pivot_root.c | |||
@@ -8,7 +8,7 @@ | |||
8 | * | 8 | * |
9 | * Licensed under GPL version 2, see file LICENSE in this tarball for details. | 9 | * Licensed under GPL version 2, see file LICENSE in this tarball for details. |
10 | */ | 10 | */ |
11 | #include "busybox.h" | 11 | #include "libbb.h" |
12 | 12 | ||
13 | extern int pivot_root(const char * new_root,const char * put_old); | 13 | extern int pivot_root(const char * new_root,const char * put_old); |
14 | 14 | ||
diff --git a/util-linux/rdate.c b/util-linux/rdate.c index 33cf64efb..9166546ae 100644 --- a/util-linux/rdate.c +++ b/util-linux/rdate.c | |||
@@ -8,7 +8,7 @@ | |||
8 | * Licensed under GPL v2 or later, see file License for details. | 8 | * Licensed under GPL v2 or later, see file License for details. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include "busybox.h" | 11 | #include "libbb.h" |
12 | 12 | ||
13 | enum { RFC_868_BIAS = 2208988800UL }; | 13 | enum { RFC_868_BIAS = 2208988800UL }; |
14 | 14 | ||
diff --git a/util-linux/readprofile.c b/util-linux/readprofile.c index a17b9c880..f2bd3bbae 100644 --- a/util-linux/readprofile.c +++ b/util-linux/readprofile.c | |||
@@ -32,7 +32,7 @@ | |||
32 | * Paul Mundt <lethal@linux-sh.org>. | 32 | * Paul Mundt <lethal@linux-sh.org>. |
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "busybox.h" | 35 | #include "libbb.h" |
36 | #include <sys/utsname.h> | 36 | #include <sys/utsname.h> |
37 | 37 | ||
38 | #define S_LEN 128 | 38 | #define S_LEN 128 |
diff --git a/util-linux/setarch.c b/util-linux/setarch.c index a7a45ec4d..f6433d6ba 100644 --- a/util-linux/setarch.c +++ b/util-linux/setarch.c | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <stdio.h> | 14 | #include <stdio.h> |
15 | #include <sys/personality.h> | 15 | #include <sys/personality.h> |
16 | 16 | ||
17 | #include "busybox.h" | 17 | #include "libbb.h" |
18 | 18 | ||
19 | int setarch_main(int ATTRIBUTE_UNUSED argc, char **argv); | 19 | int setarch_main(int ATTRIBUTE_UNUSED argc, char **argv); |
20 | int setarch_main(int ATTRIBUTE_UNUSED argc, char **argv) | 20 | int setarch_main(int ATTRIBUTE_UNUSED argc, char **argv) |
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c index 893003549..cb1bbe940 100644 --- a/util-linux/swaponoff.c +++ b/util-linux/swaponoff.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Licensed under the GPL version 2, see the file LICENSE in this tarball. | 7 | * Licensed under the GPL version 2, see the file LICENSE in this tarball. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "busybox.h" | 10 | #include "libbb.h" |
11 | #include <mntent.h> | 11 | #include <mntent.h> |
12 | #include <sys/swap.h> | 12 | #include <sys/swap.h> |
13 | 13 | ||
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c index 88bb9db2a..72a2f46c1 100644 --- a/util-linux/switch_root.c +++ b/util-linux/switch_root.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * Licensed under GPL version 2, see file LICENSE in this tarball for details. | 6 | * Licensed under GPL version 2, see file LICENSE in this tarball for details. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "busybox.h" | 9 | #include "libbb.h" |
10 | #include <sys/vfs.h> | 10 | #include <sys/vfs.h> |
11 | 11 | ||
12 | 12 | ||
diff --git a/util-linux/umount.c b/util-linux/umount.c index 19f13454b..7063a474d 100644 --- a/util-linux/umount.c +++ b/util-linux/umount.c | |||
@@ -8,9 +8,9 @@ | |||
8 | * Licensed under GPL version 2, see file LICENSE in this tarball for details. | 8 | * Licensed under GPL version 2, see file LICENSE in this tarball for details. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include "busybox.h" | ||
12 | #include <mntent.h> | 11 | #include <mntent.h> |
13 | #include <getopt.h> | 12 | #include <getopt.h> |
13 | #include "libbb.h" | ||
14 | 14 | ||
15 | #define OPTION_STRING "flDnravdt:" | 15 | #define OPTION_STRING "flDnravdt:" |
16 | #define OPT_FORCE 1 | 16 | #define OPT_FORCE 1 |