diff options
author | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2007-05-26 19:00:18 +0000 |
---|---|---|
committer | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2007-05-26 19:00:18 +0000 |
commit | d0a3ee609344cfbc050b7a5aa39ad72fd68a939a (patch) | |
tree | e28a5603e6009b2479e949b8b9b4aa0620fed400 /coreutils | |
parent | caf6acaea106e3af96450e7e8260b530f11055f6 (diff) | |
download | busybox-w32-d0a3ee609344cfbc050b7a5aa39ad72fd68a939a.tar.gz busybox-w32-d0a3ee609344cfbc050b7a5aa39ad72fd68a939a.tar.bz2 busybox-w32-d0a3ee609344cfbc050b7a5aa39ad72fd68a939a.zip |
usage.c: remove reference to busybox.h
*: s/include "busybox.h"/include "libbb.h"
git-svn-id: svn://busybox.net/trunk/busybox@18696 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'coreutils')
73 files changed, 76 insertions, 76 deletions
diff --git a/coreutils/basename.c b/coreutils/basename.c index f4307d6ce..f59d7a8de 100644 --- a/coreutils/basename.c +++ b/coreutils/basename.c | |||
@@ -20,7 +20,7 @@ | |||
20 | * 3) Save some space by using strcmp(). Calling strncmp() here was silly. | 20 | * 3) Save some space by using strcmp(). Calling strncmp() here was silly. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include "busybox.h" | 23 | #include "libbb.h" |
24 | 24 | ||
25 | /* This is a NOFORK applet. Be very careful! */ | 25 | /* This is a NOFORK applet. Be very careful! */ |
26 | 26 | ||
diff --git a/coreutils/cal.c b/coreutils/cal.c index 3d617916e..ce910bc63 100644 --- a/coreutils/cal.c +++ b/coreutils/cal.c | |||
@@ -17,7 +17,7 @@ | |||
17 | * Major size reduction... over 50% (>1.5k) on i386. | 17 | * Major size reduction... over 50% (>1.5k) on i386. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include "busybox.h" | 20 | #include "libbb.h" |
21 | 21 | ||
22 | #define THURSDAY 4 /* for reformation */ | 22 | #define THURSDAY 4 /* for reformation */ |
23 | #define SATURDAY 6 /* 1 Jan 1 was a Saturday */ | 23 | #define SATURDAY 6 /* 1 Jan 1 was a Saturday */ |
diff --git a/coreutils/cat.c b/coreutils/cat.c index ed3f33650..64e697eb3 100644 --- a/coreutils/cat.c +++ b/coreutils/cat.c | |||
@@ -10,7 +10,7 @@ | |||
10 | /* BB_AUDIT SUSv3 compliant */ | 10 | /* BB_AUDIT SUSv3 compliant */ |
11 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/cat.html */ | 11 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/cat.html */ |
12 | 12 | ||
13 | #include "busybox.h" | 13 | #include "libbb.h" |
14 | 14 | ||
15 | /* This is a NOFORK applet. Be very careful! */ | 15 | /* This is a NOFORK applet. Be very careful! */ |
16 | 16 | ||
diff --git a/coreutils/catv.c b/coreutils/catv.c index 826e0e9a6..2d2229f7f 100644 --- a/coreutils/catv.c +++ b/coreutils/catv.c | |||
@@ -10,7 +10,7 @@ | |||
10 | /* See "Cat -v considered harmful" at | 10 | /* See "Cat -v considered harmful" at |
11 | * http://cm.bell-labs.com/cm/cs/doc/84/kp.ps.gz */ | 11 | * http://cm.bell-labs.com/cm/cs/doc/84/kp.ps.gz */ |
12 | 12 | ||
13 | #include "busybox.h" | 13 | #include "libbb.h" |
14 | 14 | ||
15 | int catv_main(int argc, char **argv); | 15 | int catv_main(int argc, char **argv); |
16 | int catv_main(int argc, char **argv) | 16 | int catv_main(int argc, char **argv) |
diff --git a/coreutils/chgrp.c b/coreutils/chgrp.c index 48014ecdf..90a1cfe2b 100644 --- a/coreutils/chgrp.c +++ b/coreutils/chgrp.c | |||
@@ -11,7 +11,7 @@ | |||
11 | /* BB_AUDIT GNU defects - unsupported long options. */ | 11 | /* BB_AUDIT GNU defects - unsupported long options. */ |
12 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/chgrp.html */ | 12 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/chgrp.html */ |
13 | 13 | ||
14 | #include "busybox.h" | 14 | #include "libbb.h" |
15 | 15 | ||
16 | /* This is a NOEXEC applet. Be very careful! */ | 16 | /* This is a NOEXEC applet. Be very careful! */ |
17 | 17 | ||
diff --git a/coreutils/chmod.c b/coreutils/chmod.c index aa3625877..52cc40d97 100644 --- a/coreutils/chmod.c +++ b/coreutils/chmod.c | |||
@@ -14,7 +14,7 @@ | |||
14 | /* BB_AUDIT GNU defects - unsupported long options. */ | 14 | /* BB_AUDIT GNU defects - unsupported long options. */ |
15 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/chmod.html */ | 15 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/chmod.html */ |
16 | 16 | ||
17 | #include "busybox.h" | 17 | #include "libbb.h" |
18 | 18 | ||
19 | /* This is a NOEXEC applet. Be very careful! */ | 19 | /* This is a NOEXEC applet. Be very careful! */ |
20 | 20 | ||
diff --git a/coreutils/chown.c b/coreutils/chown.c index 71ba81247..7579e1735 100644 --- a/coreutils/chown.c +++ b/coreutils/chown.c | |||
@@ -11,7 +11,7 @@ | |||
11 | /* BB_AUDIT GNU defects - unsupported long options. */ | 11 | /* BB_AUDIT GNU defects - unsupported long options. */ |
12 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/chown.html */ | 12 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/chown.html */ |
13 | 13 | ||
14 | #include "busybox.h" | 14 | #include "libbb.h" |
15 | 15 | ||
16 | /* This is a NOEXEC applet. Be very careful! */ | 16 | /* This is a NOEXEC applet. Be very careful! */ |
17 | 17 | ||
diff --git a/coreutils/chroot.c b/coreutils/chroot.c index 874ee917e..192daa894 100644 --- a/coreutils/chroot.c +++ b/coreutils/chroot.c | |||
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */ | 10 | /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */ |
11 | 11 | ||
12 | #include "busybox.h" | 12 | #include "libbb.h" |
13 | 13 | ||
14 | int chroot_main(int argc, char **argv); | 14 | int chroot_main(int argc, char **argv); |
15 | int chroot_main(int argc, char **argv) | 15 | int chroot_main(int argc, char **argv) |
diff --git a/coreutils/cksum.c b/coreutils/cksum.c index 70febdf3a..865bea0ee 100644 --- a/coreutils/cksum.c +++ b/coreutils/cksum.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * | 6 | * |
7 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ | 7 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ |
8 | 8 | ||
9 | #include "busybox.h" | 9 | #include "libbb.h" |
10 | 10 | ||
11 | int cksum_main(int argc, char **argv); | 11 | int cksum_main(int argc, char **argv); |
12 | int cksum_main(int argc, char **argv) | 12 | int cksum_main(int argc, char **argv) |
diff --git a/coreutils/cmp.c b/coreutils/cmp.c index 80fab0b90..e5dda80ff 100644 --- a/coreutils/cmp.c +++ b/coreutils/cmp.c | |||
@@ -21,7 +21,7 @@ | |||
21 | * in the '-l' case. | 21 | * in the '-l' case. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include "busybox.h" | 24 | #include "libbb.h" |
25 | 25 | ||
26 | static FILE *cmp_xfopen_input(const char *filename) | 26 | static FILE *cmp_xfopen_input(const char *filename) |
27 | { | 27 | { |
diff --git a/coreutils/comm.c b/coreutils/comm.c index 28e3982f2..3be6760dc 100644 --- a/coreutils/comm.c +++ b/coreutils/comm.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "busybox.h" | 10 | #include "libbb.h" |
11 | 11 | ||
12 | #define COMM_OPT_1 (1 << 0) | 12 | #define COMM_OPT_1 (1 << 0) |
13 | #define COMM_OPT_2 (1 << 1) | 13 | #define COMM_OPT_2 (1 << 1) |
diff --git a/coreutils/cp.c b/coreutils/cp.c index 8c0937971..f98f281b5 100644 --- a/coreutils/cp.c +++ b/coreutils/cp.c | |||
@@ -15,7 +15,7 @@ | |||
15 | * Size reduction. | 15 | * Size reduction. |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include "busybox.h" | 18 | #include "libbb.h" |
19 | #include "libcoreutils/coreutils.h" | 19 | #include "libcoreutils/coreutils.h" |
20 | 20 | ||
21 | /* This is a NOEXEC applet. Be very careful! */ | 21 | /* This is a NOEXEC applet. Be very careful! */ |
diff --git a/coreutils/cut.c b/coreutils/cut.c index b9ea3127c..084f7be37 100644 --- a/coreutils/cut.c +++ b/coreutils/cut.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 9 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "busybox.h" | 12 | #include "libbb.h" |
13 | 13 | ||
14 | /* This is a NOEXEC applet. Be very careful! */ | 14 | /* This is a NOEXEC applet. Be very careful! */ |
15 | 15 | ||
diff --git a/coreutils/date.c b/coreutils/date.c index d2d77f413..57c826a3f 100644 --- a/coreutils/date.c +++ b/coreutils/date.c | |||
@@ -10,7 +10,7 @@ | |||
10 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 10 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include "busybox.h" | 13 | #include "libbb.h" |
14 | 14 | ||
15 | /* This 'date' command supports only 2 time setting formats, | 15 | /* This 'date' command supports only 2 time setting formats, |
16 | all the GNU strftime stuff (its in libc, lets use it), | 16 | all the GNU strftime stuff (its in libc, lets use it), |
diff --git a/coreutils/dd.c b/coreutils/dd.c index 5aee9dbb4..dd311d86a 100644 --- a/coreutils/dd.c +++ b/coreutils/dd.c | |||
@@ -9,7 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <signal.h> /* For FEATURE_DD_SIGNAL_HANDLING */ | 11 | #include <signal.h> /* For FEATURE_DD_SIGNAL_HANDLING */ |
12 | #include "busybox.h" | 12 | #include "libbb.h" |
13 | 13 | ||
14 | /* This is a NOEXEC applet. Be very careful! */ | 14 | /* This is a NOEXEC applet. Be very careful! */ |
15 | 15 | ||
diff --git a/coreutils/df.c b/coreutils/df.c index 484cabb37..d455d27f6 100644 --- a/coreutils/df.c +++ b/coreutils/df.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <unistd.h> | 24 | #include <unistd.h> |
25 | #include <mntent.h> | 25 | #include <mntent.h> |
26 | #include <sys/vfs.h> | 26 | #include <sys/vfs.h> |
27 | #include "busybox.h" | 27 | #include "libbb.h" |
28 | 28 | ||
29 | #ifndef CONFIG_FEATURE_HUMAN_READABLE | 29 | #ifndef CONFIG_FEATURE_HUMAN_READABLE |
30 | static long kscale(long b, long bs) | 30 | static long kscale(long b, long bs) |
diff --git a/coreutils/diff.c b/coreutils/diff.c index 09cacbde6..f6b045b2d 100644 --- a/coreutils/diff.c +++ b/coreutils/diff.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 12 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "busybox.h" | 15 | #include "libbb.h" |
16 | 16 | ||
17 | #define FSIZE_MAX 32768 | 17 | #define FSIZE_MAX 32768 |
18 | 18 | ||
diff --git a/coreutils/dirname.c b/coreutils/dirname.c index 7c5484bfd..fd2c381c8 100644 --- a/coreutils/dirname.c +++ b/coreutils/dirname.c | |||
@@ -10,7 +10,7 @@ | |||
10 | /* BB_AUDIT SUSv3 compliant */ | 10 | /* BB_AUDIT SUSv3 compliant */ |
11 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/dirname.html */ | 11 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/dirname.html */ |
12 | 12 | ||
13 | #include "busybox.h" | 13 | #include "libbb.h" |
14 | 14 | ||
15 | /* This is a NOFORK applet. Be very careful! */ | 15 | /* This is a NOFORK applet. Be very careful! */ |
16 | 16 | ||
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c index 04c56ac9c..b053a0cbf 100644 --- a/coreutils/dos2unix.c +++ b/coreutils/dos2unix.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. | 12 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "busybox.h" | 15 | #include "libbb.h" |
16 | 16 | ||
17 | enum ConvType { | 17 | enum ConvType { |
18 | CT_UNIX2DOS = 1, | 18 | CT_UNIX2DOS = 1, |
diff --git a/coreutils/du.c b/coreutils/du.c index e95f3a2f1..cb3e715d9 100644 --- a/coreutils/du.c +++ b/coreutils/du.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * 4) Fixed busybox bug #1284 involving long overflow with human_readable. | 23 | * 4) Fixed busybox bug #1284 involving long overflow with human_readable. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "busybox.h" | 26 | #include "libbb.h" |
27 | 27 | ||
28 | #if ENABLE_FEATURE_HUMAN_READABLE | 28 | #if ENABLE_FEATURE_HUMAN_READABLE |
29 | # if ENABLE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K | 29 | # if ENABLE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K |
diff --git a/coreutils/echo.c b/coreutils/echo.c index 2de19c2e3..9aad2c2ba 100644 --- a/coreutils/echo.c +++ b/coreutils/echo.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * The previous version did not allow 4-digit octals. | 23 | * The previous version did not allow 4-digit octals. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "busybox.h" | 26 | #include "libbb.h" |
27 | 27 | ||
28 | int bb_echo(char **argv) | 28 | int bb_echo(char **argv) |
29 | { | 29 | { |
diff --git a/coreutils/env.c b/coreutils/env.c index 2a271f703..ad30f0193 100644 --- a/coreutils/env.c +++ b/coreutils/env.c | |||
@@ -29,11 +29,11 @@ | |||
29 | * - use xfunc_error_retval | 29 | * - use xfunc_error_retval |
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include "busybox.h" | ||
33 | #include <errno.h> | ||
34 | #include <getopt.h> /* struct option */ | 32 | #include <getopt.h> /* struct option */ |
35 | extern char **environ; | 33 | extern char **environ; |
36 | 34 | ||
35 | #include "libbb.h" | ||
36 | |||
37 | #if ENABLE_FEATURE_ENV_LONG_OPTIONS | 37 | #if ENABLE_FEATURE_ENV_LONG_OPTIONS |
38 | static const struct option env_long_options[] = { | 38 | static const struct option env_long_options[] = { |
39 | { "ignore-environment", 0, NULL, 'i' }, | 39 | { "ignore-environment", 0, NULL, 'i' }, |
diff --git a/coreutils/expr.c b/coreutils/expr.c index b6bd383f6..46e18d190 100644 --- a/coreutils/expr.c +++ b/coreutils/expr.c | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | /* no getopt needed */ | 26 | /* no getopt needed */ |
27 | 27 | ||
28 | #include "busybox.h" | 28 | #include "libbb.h" |
29 | #include "xregex.h" | 29 | #include "xregex.h" |
30 | 30 | ||
31 | /* The kinds of value we can have. */ | 31 | /* The kinds of value we can have. */ |
diff --git a/coreutils/false.c b/coreutils/false.c index 90d6a0162..07cf9e83e 100644 --- a/coreutils/false.c +++ b/coreutils/false.c | |||
@@ -10,7 +10,7 @@ | |||
10 | /* BB_AUDIT SUSv3 compliant */ | 10 | /* BB_AUDIT SUSv3 compliant */ |
11 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/false.html */ | 11 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/false.html */ |
12 | 12 | ||
13 | #include "busybox.h" | 13 | #include "libbb.h" |
14 | 14 | ||
15 | /* This is a NOFORK applet. Be very careful! */ | 15 | /* This is a NOFORK applet. Be very careful! */ |
16 | 16 | ||
diff --git a/coreutils/fold.c b/coreutils/fold.c index 4ce52cf0b..d5e3a4d72 100644 --- a/coreutils/fold.c +++ b/coreutils/fold.c | |||
@@ -10,7 +10,7 @@ | |||
10 | Licensed under the GPL v2 or later, see the file LICENSE in this tarball. | 10 | Licensed under the GPL v2 or later, see the file LICENSE in this tarball. |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include "busybox.h" | 13 | #include "libbb.h" |
14 | 14 | ||
15 | static unsigned long flags; | 15 | static unsigned long flags; |
16 | #define FLAG_COUNT_BYTES 1 | 16 | #define FLAG_COUNT_BYTES 1 |
diff --git a/coreutils/head.c b/coreutils/head.c index ed1d01d52..1700af27a 100644 --- a/coreutils/head.c +++ b/coreutils/head.c | |||
@@ -11,7 +11,7 @@ | |||
11 | /* BB_AUDIT GNU compatible -c, -q, and -v options in 'fancy' configuration. */ | 11 | /* BB_AUDIT GNU compatible -c, -q, and -v options in 'fancy' configuration. */ |
12 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/head.html */ | 12 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/head.html */ |
13 | 13 | ||
14 | #include "busybox.h" | 14 | #include "libbb.h" |
15 | 15 | ||
16 | static const char head_opts[] = | 16 | static const char head_opts[] = |
17 | "n:" | 17 | "n:" |
diff --git a/coreutils/hostid.c b/coreutils/hostid.c index e14f6ca57..7d96651e7 100644 --- a/coreutils/hostid.c +++ b/coreutils/hostid.c | |||
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */ | 10 | /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */ |
11 | 11 | ||
12 | #include "busybox.h" | 12 | #include "libbb.h" |
13 | 13 | ||
14 | /* This is a NOFORK applet. Be very careful! */ | 14 | /* This is a NOFORK applet. Be very careful! */ |
15 | 15 | ||
diff --git a/coreutils/id.c b/coreutils/id.c index 8a604195d..064bd29d9 100644 --- a/coreutils/id.c +++ b/coreutils/id.c | |||
@@ -13,7 +13,7 @@ | |||
13 | * -Z option support: by Yuichi Nakamura <ynakam@hitachisoft.jp> | 13 | * -Z option support: by Yuichi Nakamura <ynakam@hitachisoft.jp> |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "busybox.h" | 16 | #include "libbb.h" |
17 | #include <stdio.h> | 17 | #include <stdio.h> |
18 | #include <unistd.h> | 18 | #include <unistd.h> |
19 | #include <sys/types.h> | 19 | #include <sys/types.h> |
diff --git a/coreutils/install.c b/coreutils/install.c index ece5b955b..7f168d2fd 100644 --- a/coreutils/install.c +++ b/coreutils/install.c | |||
@@ -9,11 +9,12 @@ | |||
9 | * owner/group, will probably modify bb_make_directory(...) | 9 | * owner/group, will probably modify bb_make_directory(...) |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "busybox.h" | ||
13 | #include "libcoreutils/coreutils.h" | ||
14 | #include <libgen.h> | 12 | #include <libgen.h> |
15 | #include <getopt.h> /* struct option */ | 13 | #include <getopt.h> /* struct option */ |
16 | 14 | ||
15 | #include "libbb.h" | ||
16 | #include "libcoreutils/coreutils.h" | ||
17 | |||
17 | #if ENABLE_FEATURE_INSTALL_LONG_OPTIONS | 18 | #if ENABLE_FEATURE_INSTALL_LONG_OPTIONS |
18 | static const struct option install_long_options[] = { | 19 | static const struct option install_long_options[] = { |
19 | { "directory", 0, NULL, 'd' }, | 20 | { "directory", 0, NULL, 'd' }, |
diff --git a/coreutils/length.c b/coreutils/length.c index b3a9d4903..a310b3b2f 100644 --- a/coreutils/length.c +++ b/coreutils/length.c | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | /* BB_AUDIT SUSv3 N/A -- Apparently a busybox (obsolete?) extension. */ | 3 | /* BB_AUDIT SUSv3 N/A -- Apparently a busybox (obsolete?) extension. */ |
4 | 4 | ||
5 | #include "busybox.h" | 5 | #include "libbb.h" |
6 | 6 | ||
7 | /* This is a NOFORK applet. Be very careful! */ | 7 | /* This is a NOFORK applet. Be very careful! */ |
8 | 8 | ||
diff --git a/coreutils/ln.c b/coreutils/ln.c index fd4eacec2..93a283d41 100644 --- a/coreutils/ln.c +++ b/coreutils/ln.c | |||
@@ -11,7 +11,7 @@ | |||
11 | /* BB_AUDIT GNU options missing: -d, -F, -i, and -v. */ | 11 | /* BB_AUDIT GNU options missing: -d, -F, -i, and -v. */ |
12 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/ln.html */ | 12 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/ln.html */ |
13 | 13 | ||
14 | #include "busybox.h" | 14 | #include "libbb.h" |
15 | 15 | ||
16 | /* This is a NOEXEC applet. Be very careful! */ | 16 | /* This is a NOEXEC applet. Be very careful! */ |
17 | 17 | ||
diff --git a/coreutils/logname.c b/coreutils/logname.c index aba6ce3c6..2e628bc14 100644 --- a/coreutils/logname.c +++ b/coreutils/logname.c | |||
@@ -20,7 +20,7 @@ | |||
20 | * a diagnostic message and an error return. | 20 | * a diagnostic message and an error return. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include "busybox.h" | 23 | #include "libbb.h" |
24 | 24 | ||
25 | /* This is a NOFORK applet. Be very careful! */ | 25 | /* This is a NOFORK applet. Be very careful! */ |
26 | 26 | ||
diff --git a/coreutils/ls.c b/coreutils/ls.c index b9c07adf8..e2ed3ee1f 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c | |||
@@ -30,7 +30,7 @@ | |||
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include <getopt.h> | 32 | #include <getopt.h> |
33 | #include "busybox.h" | 33 | #include "libbb.h" |
34 | 34 | ||
35 | /* This is a NOEXEC applet. Be very careful! */ | 35 | /* This is a NOEXEC applet. Be very careful! */ |
36 | 36 | ||
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c index a3818d519..4523fa4ec 100644 --- a/coreutils/md5_sha1_sum.c +++ b/coreutils/md5_sha1_sum.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. | 6 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "busybox.h" | 9 | #include "libbb.h" |
10 | 10 | ||
11 | typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t; | 11 | typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t; |
12 | 12 | ||
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c index 5a6c9d077..60c03a1f9 100644 --- a/coreutils/mkdir.c +++ b/coreutils/mkdir.c | |||
@@ -20,7 +20,7 @@ | |||
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <getopt.h> /* struct option */ | 22 | #include <getopt.h> /* struct option */ |
23 | #include "busybox.h" | 23 | #include "libbb.h" |
24 | 24 | ||
25 | /* This is a NOFORK applet. Be very careful! */ | 25 | /* This is a NOFORK applet. Be very careful! */ |
26 | 26 | ||
diff --git a/coreutils/mkfifo.c b/coreutils/mkfifo.c index 7dcc50fa9..030c9d22f 100644 --- a/coreutils/mkfifo.c +++ b/coreutils/mkfifo.c | |||
@@ -10,7 +10,7 @@ | |||
10 | /* BB_AUDIT SUSv3 compliant */ | 10 | /* BB_AUDIT SUSv3 compliant */ |
11 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/mkfifo.html */ | 11 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/mkfifo.html */ |
12 | 12 | ||
13 | #include "busybox.h" | 13 | #include "libbb.h" |
14 | #include "libcoreutils/coreutils.h" | 14 | #include "libcoreutils/coreutils.h" |
15 | 15 | ||
16 | int mkfifo_main(int argc, char **argv); | 16 | int mkfifo_main(int argc, char **argv); |
diff --git a/coreutils/mknod.c b/coreutils/mknod.c index 6fa6d8353..415ef55c1 100644 --- a/coreutils/mknod.c +++ b/coreutils/mknod.c | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | #include <sys/sysmacros.h> // For makedev | 12 | #include <sys/sysmacros.h> // For makedev |
13 | 13 | ||
14 | #include "busybox.h" | 14 | #include "libbb.h" |
15 | #include "libcoreutils/coreutils.h" | 15 | #include "libcoreutils/coreutils.h" |
16 | 16 | ||
17 | static const char modes_chars[] = { 'p', 'c', 'u', 'b', 0, 1, 1, 2 }; | 17 | static const char modes_chars[] = { 'p', 'c', 'u', 'b', 0, 1, 1, 2 }; |
diff --git a/coreutils/mv.c b/coreutils/mv.c index c08d2327c..ad36051f9 100644 --- a/coreutils/mv.c +++ b/coreutils/mv.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <errno.h> | 20 | #include <errno.h> |
21 | #include <stdlib.h> | 21 | #include <stdlib.h> |
22 | #include <getopt.h> /* struct option */ | 22 | #include <getopt.h> /* struct option */ |
23 | #include "busybox.h" | 23 | #include "libbb.h" |
24 | #include "libcoreutils/coreutils.h" | 24 | #include "libcoreutils/coreutils.h" |
25 | 25 | ||
26 | #if ENABLE_FEATURE_MV_LONG_OPTIONS | 26 | #if ENABLE_FEATURE_MV_LONG_OPTIONS |
diff --git a/coreutils/nice.c b/coreutils/nice.c index 328531528..8d77ae472 100644 --- a/coreutils/nice.c +++ b/coreutils/nice.c | |||
@@ -8,7 +8,7 @@ | |||
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <sys/resource.h> | 10 | #include <sys/resource.h> |
11 | #include "busybox.h" | 11 | #include "libbb.h" |
12 | 12 | ||
13 | int nice_main(int argc, char **argv); | 13 | int nice_main(int argc, char **argv); |
14 | int nice_main(int argc, char **argv) | 14 | int nice_main(int argc, char **argv) |
diff --git a/coreutils/nohup.c b/coreutils/nohup.c index 6a6c70e13..22419b800 100644 --- a/coreutils/nohup.c +++ b/coreutils/nohup.c | |||
@@ -10,7 +10,7 @@ | |||
10 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 10 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include "busybox.h" | 13 | #include "libbb.h" |
14 | 14 | ||
15 | int nohup_main(int argc, char **argv); | 15 | int nohup_main(int argc, char **argv); |
16 | int nohup_main(int argc, char **argv) | 16 | int nohup_main(int argc, char **argv) |
diff --git a/coreutils/od.c b/coreutils/od.c index 0de9def5a..00de080b6 100644 --- a/coreutils/od.c +++ b/coreutils/od.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | 14 | ||
15 | #include "busybox.h" | 15 | #include "libbb.h" |
16 | #if ENABLE_DESKTOP | 16 | #if ENABLE_DESKTOP |
17 | /* This one provides -t (busybox's own build script needs it) */ | 17 | /* This one provides -t (busybox's own build script needs it) */ |
18 | #include "od_bloaty.c" | 18 | #include "od_bloaty.c" |
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c index efdbf354a..325085626 100644 --- a/coreutils/od_bloaty.c +++ b/coreutils/od_bloaty.c | |||
@@ -49,8 +49,7 @@ diff -u -a std bbox >bbox.diff || { echo Different!; sleep 1; } | |||
49 | 49 | ||
50 | */ | 50 | */ |
51 | 51 | ||
52 | 52 | #include "libbb.h" | |
53 | #include "busybox.h" | ||
54 | #include <getopt.h> | 53 | #include <getopt.h> |
55 | 54 | ||
56 | #define assert(a) ((void)0) | 55 | #define assert(a) ((void)0) |
diff --git a/coreutils/printenv.c b/coreutils/printenv.c index 935f52df3..0e69ff217 100644 --- a/coreutils/printenv.c +++ b/coreutils/printenv.c | |||
@@ -11,7 +11,7 @@ | |||
11 | #include <stdio.h> | 11 | #include <stdio.h> |
12 | #include <string.h> | 12 | #include <string.h> |
13 | #include <stdlib.h> | 13 | #include <stdlib.h> |
14 | #include "busybox.h" | 14 | #include "libbb.h" |
15 | extern char **environ; | 15 | extern char **environ; |
16 | 16 | ||
17 | int printenv_main(int argc, char **argv); | 17 | int printenv_main(int argc, char **argv); |
diff --git a/coreutils/printf.c b/coreutils/printf.c index a2a82d249..d0cf5a671 100644 --- a/coreutils/printf.c +++ b/coreutils/printf.c | |||
@@ -38,7 +38,7 @@ | |||
38 | 38 | ||
39 | // 19990508 Busy Boxed! Dave Cinege | 39 | // 19990508 Busy Boxed! Dave Cinege |
40 | 40 | ||
41 | #include "busybox.h" | 41 | #include "libbb.h" |
42 | 42 | ||
43 | typedef void (*converter)(const char *arg, void *result); | 43 | typedef void (*converter)(const char *arg, void *result); |
44 | 44 | ||
diff --git a/coreutils/pwd.c b/coreutils/pwd.c index a93b8f115..73a9d5be8 100644 --- a/coreutils/pwd.c +++ b/coreutils/pwd.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "busybox.h" | 10 | #include "libbb.h" |
11 | 11 | ||
12 | /* This is a NOFORK applet. Be very careful! */ | 12 | /* This is a NOFORK applet. Be very careful! */ |
13 | 13 | ||
diff --git a/coreutils/realpath.c b/coreutils/realpath.c index b3f7e4957..7c5dc3b10 100644 --- a/coreutils/realpath.c +++ b/coreutils/realpath.c | |||
@@ -10,7 +10,7 @@ | |||
10 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 10 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include "busybox.h" | 13 | #include "libbb.h" |
14 | 14 | ||
15 | int realpath_main(int argc, char **argv); | 15 | int realpath_main(int argc, char **argv); |
16 | int realpath_main(int argc, char **argv) | 16 | int realpath_main(int argc, char **argv) |
diff --git a/coreutils/rm.c b/coreutils/rm.c index e29073db8..cc2264770 100644 --- a/coreutils/rm.c +++ b/coreutils/rm.c | |||
@@ -15,7 +15,7 @@ | |||
15 | * Size reduction. | 15 | * Size reduction. |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include "busybox.h" | 18 | #include "libbb.h" |
19 | 19 | ||
20 | /* This is a NOFORK applet. Be very careful! */ | 20 | /* This is a NOFORK applet. Be very careful! */ |
21 | 21 | ||
diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c index 7f3253017..c1b89e427 100644 --- a/coreutils/rmdir.c +++ b/coreutils/rmdir.c | |||
@@ -11,7 +11,7 @@ | |||
11 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/rmdir.html */ | 11 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/rmdir.html */ |
12 | 12 | ||
13 | #include <libgen.h> | 13 | #include <libgen.h> |
14 | #include "busybox.h" | 14 | #include "libbb.h" |
15 | 15 | ||
16 | /* This is a NOFORK applet. Be very careful! */ | 16 | /* This is a NOFORK applet. Be very careful! */ |
17 | 17 | ||
diff --git a/coreutils/seq.c b/coreutils/seq.c index ef884d6ae..050c33317 100644 --- a/coreutils/seq.c +++ b/coreutils/seq.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Licensed under the GPL v2, see the file LICENSE in this tarball. | 7 | * Licensed under the GPL v2, see the file LICENSE in this tarball. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "busybox.h" | 10 | #include "libbb.h" |
11 | 11 | ||
12 | /* This is a NOFORK applet. Be very careful! */ | 12 | /* This is a NOFORK applet. Be very careful! */ |
13 | 13 | ||
diff --git a/coreutils/sleep.c b/coreutils/sleep.c index 592005bab..e9a30daf2 100644 --- a/coreutils/sleep.c +++ b/coreutils/sleep.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * time suffixes for seconds, minutes, hours, and days. | 18 | * time suffixes for seconds, minutes, hours, and days. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include "busybox.h" | 21 | #include "libbb.h" |
22 | 22 | ||
23 | /* This is a NOFORK applet. Be very careful! */ | 23 | /* This is a NOFORK applet. Be very careful! */ |
24 | 24 | ||
diff --git a/coreutils/sort.c b/coreutils/sort.c index 06a6cbf70..f41bd6329 100644 --- a/coreutils/sort.c +++ b/coreutils/sort.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html | 12 | * http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "busybox.h" | 15 | #include "libbb.h" |
16 | 16 | ||
17 | /* This is a NOEXEC applet. Be very careful! */ | 17 | /* This is a NOEXEC applet. Be very careful! */ |
18 | 18 | ||
diff --git a/coreutils/split.c b/coreutils/split.c index 10035e9ab..27f9cfdd6 100644 --- a/coreutils/split.c +++ b/coreutils/split.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * SUSv3 requirements: | 9 | * SUSv3 requirements: |
10 | * http://www.opengroup.org/onlinepubs/009695399/utilities/split.html | 10 | * http://www.opengroup.org/onlinepubs/009695399/utilities/split.html |
11 | */ | 11 | */ |
12 | #include "busybox.h" | 12 | #include "libbb.h" |
13 | 13 | ||
14 | static const struct suffix_mult split_suffices[] = { | 14 | static const struct suffix_mult split_suffices[] = { |
15 | #if ENABLE_FEATURE_SPLIT_FANCY | 15 | #if ENABLE_FEATURE_SPLIT_FANCY |
diff --git a/coreutils/stat.c b/coreutils/stat.c index 16b8d1e44..9930d847d 100644 --- a/coreutils/stat.c +++ b/coreutils/stat.c | |||
@@ -13,7 +13,7 @@ | |||
13 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 13 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "busybox.h" | 16 | #include "libbb.h" |
17 | 17 | ||
18 | /* vars to control behavior */ | 18 | /* vars to control behavior */ |
19 | #define OPT_FILESYS (1<<0) | 19 | #define OPT_FILESYS (1<<0) |
diff --git a/coreutils/stty.c b/coreutils/stty.c index 702cada63..488a7f8fb 100644 --- a/coreutils/stty.c +++ b/coreutils/stty.c | |||
@@ -21,7 +21,7 @@ | |||
21 | 21 | ||
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include "busybox.h" | 24 | #include "libbb.h" |
25 | 25 | ||
26 | #ifndef _POSIX_VDISABLE | 26 | #ifndef _POSIX_VDISABLE |
27 | # define _POSIX_VDISABLE ((unsigned char) 0) | 27 | # define _POSIX_VDISABLE ((unsigned char) 0) |
diff --git a/coreutils/sum.c b/coreutils/sum.c index 9327ca55e..5799d142d 100644 --- a/coreutils/sum.c +++ b/coreutils/sum.c | |||
@@ -13,7 +13,7 @@ | |||
13 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. | 13 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "busybox.h" | 16 | #include "libbb.h" |
17 | 17 | ||
18 | enum { SUM_BSD, PRINT_NAME, SUM_SYSV }; | 18 | enum { SUM_BSD, PRINT_NAME, SUM_SYSV }; |
19 | 19 | ||
diff --git a/coreutils/sync.c b/coreutils/sync.c index e52ab768d..d562f3fc5 100644 --- a/coreutils/sync.c +++ b/coreutils/sync.c | |||
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */ | 10 | /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */ |
11 | 11 | ||
12 | #include "busybox.h" | 12 | #include "libbb.h" |
13 | 13 | ||
14 | /* This is a NOFORK applet. Be very careful! */ | 14 | /* This is a NOFORK applet. Be very careful! */ |
15 | 15 | ||
diff --git a/coreutils/tail.c b/coreutils/tail.c index 32df25914..e0d21ed34 100644 --- a/coreutils/tail.c +++ b/coreutils/tail.c | |||
@@ -24,7 +24,7 @@ | |||
24 | * 7) lseek attempted when count==0 even if arg was +0 (from top) | 24 | * 7) lseek attempted when count==0 even if arg was +0 (from top) |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "busybox.h" | 27 | #include "libbb.h" |
28 | 28 | ||
29 | static const struct suffix_mult tail_suffixes[] = { | 29 | static const struct suffix_mult tail_suffixes[] = { |
30 | { "b", 512 }, | 30 | { "b", 512 }, |
diff --git a/coreutils/tee.c b/coreutils/tee.c index 338232ce9..2160141c9 100644 --- a/coreutils/tee.c +++ b/coreutils/tee.c | |||
@@ -10,7 +10,7 @@ | |||
10 | /* BB_AUDIT SUSv3 compliant */ | 10 | /* BB_AUDIT SUSv3 compliant */ |
11 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/tee.html */ | 11 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/tee.html */ |
12 | 12 | ||
13 | #include "busybox.h" | 13 | #include "libbb.h" |
14 | #include <signal.h> | 14 | #include <signal.h> |
15 | 15 | ||
16 | int tee_main(int argc, char **argv); | 16 | int tee_main(int argc, char **argv); |
diff --git a/coreutils/test.c b/coreutils/test.c index 70b392f38..df8387b14 100644 --- a/coreutils/test.c +++ b/coreutils/test.c | |||
@@ -20,7 +20,7 @@ | |||
20 | * "This program is in the Public Domain." | 20 | * "This program is in the Public Domain." |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include "busybox.h" | 23 | #include "libbb.h" |
24 | #include <setjmp.h> | 24 | #include <setjmp.h> |
25 | 25 | ||
26 | /* This is a NOEXEC applet. Be very careful! */ | 26 | /* This is a NOEXEC applet. Be very careful! */ |
diff --git a/coreutils/touch.c b/coreutils/touch.c index 5f81b2380..7b82339fc 100644 --- a/coreutils/touch.c +++ b/coreutils/touch.c | |||
@@ -17,7 +17,7 @@ | |||
17 | * Also, exiting on a failure was a bug. All args should be processed. | 17 | * Also, exiting on a failure was a bug. All args should be processed. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include "busybox.h" | 20 | #include "libbb.h" |
21 | 21 | ||
22 | /* This is a NOFORK applet. Be very careful! */ | 22 | /* This is a NOFORK applet. Be very careful! */ |
23 | 23 | ||
diff --git a/coreutils/tr.c b/coreutils/tr.c index 5d3dd4cd8..7e89e9a80 100644 --- a/coreutils/tr.c +++ b/coreutils/tr.c | |||
@@ -18,7 +18,7 @@ | |||
18 | /* http://www.opengroup.org/onlinepubs/009695399/utilities/tr.html | 18 | /* http://www.opengroup.org/onlinepubs/009695399/utilities/tr.html |
19 | * TODO: xdigit, graph, print | 19 | * TODO: xdigit, graph, print |
20 | */ | 20 | */ |
21 | #include "busybox.h" | 21 | #include "libbb.h" |
22 | 22 | ||
23 | #define ASCII 0377 | 23 | #define ASCII 0377 |
24 | 24 | ||
diff --git a/coreutils/true.c b/coreutils/true.c index eee621331..9dcd69aa3 100644 --- a/coreutils/true.c +++ b/coreutils/true.c | |||
@@ -10,7 +10,7 @@ | |||
10 | /* BB_AUDIT SUSv3 compliant */ | 10 | /* BB_AUDIT SUSv3 compliant */ |
11 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/true.html */ | 11 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/true.html */ |
12 | 12 | ||
13 | #include "busybox.h" | 13 | #include "libbb.h" |
14 | 14 | ||
15 | /* This is a NOFORK applet. Be very careful! */ | 15 | /* This is a NOFORK applet. Be very careful! */ |
16 | 16 | ||
diff --git a/coreutils/tty.c b/coreutils/tty.c index d4c179fca..2c77c9960 100644 --- a/coreutils/tty.c +++ b/coreutils/tty.c | |||
@@ -10,7 +10,7 @@ | |||
10 | /* BB_AUDIT SUSv3 compliant */ | 10 | /* BB_AUDIT SUSv3 compliant */ |
11 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/tty.html */ | 11 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/tty.html */ |
12 | 12 | ||
13 | #include "busybox.h" | 13 | #include "libbb.h" |
14 | 14 | ||
15 | int tty_main(int argc, char **argv); | 15 | int tty_main(int argc, char **argv); |
16 | int tty_main(int argc, char **argv) | 16 | int tty_main(int argc, char **argv) |
diff --git a/coreutils/uname.c b/coreutils/uname.c index 2faa89321..d4188cdae 100644 --- a/coreutils/uname.c +++ b/coreutils/uname.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #include <unistd.h> | 37 | #include <unistd.h> |
38 | #include <sys/types.h> | 38 | #include <sys/types.h> |
39 | #include <sys/utsname.h> | 39 | #include <sys/utsname.h> |
40 | #include "busybox.h" | 40 | #include "libbb.h" |
41 | 41 | ||
42 | typedef struct { | 42 | typedef struct { |
43 | struct utsname name; | 43 | struct utsname name; |
diff --git a/coreutils/uniq.c b/coreutils/uniq.c index 11a731aaa..adc196b97 100644 --- a/coreutils/uniq.c +++ b/coreutils/uniq.c | |||
@@ -10,7 +10,7 @@ | |||
10 | /* BB_AUDIT SUSv3 compliant */ | 10 | /* BB_AUDIT SUSv3 compliant */ |
11 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/uniq.html */ | 11 | /* http://www.opengroup.org/onlinepubs/007904975/utilities/uniq.html */ |
12 | 12 | ||
13 | #include "busybox.h" | 13 | #include "libbb.h" |
14 | 14 | ||
15 | static const char uniq_opts[] = "cdu" "f:s:" "cdu\0\1\2\4"; | 15 | static const char uniq_opts[] = "cdu" "f:s:" "cdu\0\1\2\4"; |
16 | 16 | ||
diff --git a/coreutils/usleep.c b/coreutils/usleep.c index 2baf2bc87..e0cd56e54 100644 --- a/coreutils/usleep.c +++ b/coreutils/usleep.c | |||
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | /* BB_AUDIT SUSv3 N/A -- Apparently a busybox extension. */ | 10 | /* BB_AUDIT SUSv3 N/A -- Apparently a busybox extension. */ |
11 | 11 | ||
12 | #include "busybox.h" | 12 | #include "libbb.h" |
13 | 13 | ||
14 | /* This is a NOFORK applet. Be very careful! */ | 14 | /* This is a NOFORK applet. Be very careful! */ |
15 | 15 | ||
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c index c195a3e6f..779710edd 100644 --- a/coreutils/uudecode.c +++ b/coreutils/uudecode.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | 14 | ||
15 | #include "busybox.h" | 15 | #include "libbb.h" |
16 | 16 | ||
17 | static void read_stduu(FILE *src_stream, FILE *dst_stream) | 17 | static void read_stduu(FILE *src_stream, FILE *dst_stream) |
18 | { | 18 | { |
diff --git a/coreutils/uuencode.c b/coreutils/uuencode.c index 3207d7296..9490474b9 100644 --- a/coreutils/uuencode.c +++ b/coreutils/uuencode.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 | 13 | ||
14 | #define SRC_BUF_SIZE 45 // This *MUST* be a multiple of 3 | 14 | #define SRC_BUF_SIZE 45 // This *MUST* be a multiple of 3 |
diff --git a/coreutils/watch.c b/coreutils/watch.c index 60a4a71ce..2ad0564cd 100644 --- a/coreutils/watch.c +++ b/coreutils/watch.c | |||
@@ -11,7 +11,7 @@ | |||
11 | /* BB_AUDIT SUSv3 N/A */ | 11 | /* BB_AUDIT SUSv3 N/A */ |
12 | /* BB_AUDIT GNU defects -- only option -n is supported. */ | 12 | /* BB_AUDIT GNU defects -- only option -n is supported. */ |
13 | 13 | ||
14 | #include "busybox.h" | 14 | #include "libbb.h" |
15 | 15 | ||
16 | // procps 2.0.18: | 16 | // procps 2.0.18: |
17 | // watch [-d] [-n seconds] | 17 | // watch [-d] [-n seconds] |
diff --git a/coreutils/wc.c b/coreutils/wc.c index 926b3ac19..04112c194 100644 --- a/coreutils/wc.c +++ b/coreutils/wc.c | |||
@@ -41,7 +41,7 @@ | |||
41 | * for which 'wc -c' should output '0'. | 41 | * for which 'wc -c' should output '0'. |
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include "busybox.h" | 44 | #include "libbb.h" |
45 | 45 | ||
46 | #ifdef CONFIG_LOCALE_SUPPORT | 46 | #ifdef CONFIG_LOCALE_SUPPORT |
47 | #define isspace_given_isprint(c) isspace(c) | 47 | #define isspace_given_isprint(c) isspace(c) |
diff --git a/coreutils/who.c b/coreutils/who.c index a5d3b02eb..546050aee 100644 --- a/coreutils/who.c +++ b/coreutils/who.c | |||
@@ -17,7 +17,7 @@ | |||
17 | *---------------------------------------------------------------------- | 17 | *---------------------------------------------------------------------- |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include "busybox.h" | 20 | #include "libbb.h" |
21 | #include <utmp.h> | 21 | #include <utmp.h> |
22 | #include <time.h> | 22 | #include <time.h> |
23 | 23 | ||
diff --git a/coreutils/whoami.c b/coreutils/whoami.c index 25757f633..156516fa7 100644 --- a/coreutils/whoami.c +++ b/coreutils/whoami.c | |||
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */ | 10 | /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */ |
11 | 11 | ||
12 | #include "busybox.h" | 12 | #include "libbb.h" |
13 | 13 | ||
14 | /* This is a NOFORK applet. Be very careful! */ | 14 | /* This is a NOFORK applet. Be very careful! */ |
15 | 15 | ||
diff --git a/coreutils/yes.c b/coreutils/yes.c index 569764150..5529eab14 100644 --- a/coreutils/yes.c +++ b/coreutils/yes.c | |||
@@ -14,7 +14,7 @@ | |||
14 | * Size reductions and removed redundant applet name prefix from error messages. | 14 | * Size reductions and removed redundant applet name prefix from error messages. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "busybox.h" | 17 | #include "libbb.h" |
18 | 18 | ||
19 | /* This is a NOFORK applet. Be very careful! */ | 19 | /* This is a NOFORK applet. Be very careful! */ |
20 | 20 | ||