diff options
Diffstat (limited to 'miscutils')
-rw-r--r-- | miscutils/adjtimex.c | 2 | ||||
-rw-r--r-- | miscutils/bbconfig.c | 2 | ||||
-rw-r--r-- | miscutils/chrt.c | 2 | ||||
-rw-r--r-- | miscutils/crond.c | 2 | ||||
-rw-r--r-- | miscutils/crontab.c | 2 | ||||
-rw-r--r-- | miscutils/dc.c | 2 | ||||
-rw-r--r-- | miscutils/devfsd.c | 2 | ||||
-rw-r--r-- | miscutils/eject.c | 2 | ||||
-rw-r--r-- | miscutils/hdparm.c | 2 | ||||
-rw-r--r-- | miscutils/last.c | 2 | ||||
-rw-r--r-- | miscutils/less.c | 2 | ||||
-rw-r--r-- | miscutils/makedevs.c | 2 | ||||
-rw-r--r-- | miscutils/mountpoint.c | 2 | ||||
-rw-r--r-- | miscutils/mt.c | 2 | ||||
-rw-r--r-- | miscutils/nmeter.c | 2 | ||||
-rw-r--r-- | miscutils/raidautorun.c | 2 | ||||
-rw-r--r-- | miscutils/readahead.c | 2 | ||||
-rw-r--r-- | miscutils/runlevel.c | 2 | ||||
-rw-r--r-- | miscutils/rx.c | 2 | ||||
-rw-r--r-- | miscutils/setsid.c | 2 | ||||
-rw-r--r-- | miscutils/strings.c | 6 | ||||
-rw-r--r-- | miscutils/taskset.c | 2 | ||||
-rw-r--r-- | miscutils/time.c | 2 | ||||
-rw-r--r-- | miscutils/watchdog.c | 2 |
24 files changed, 25 insertions, 27 deletions
diff --git a/miscutils/adjtimex.c b/miscutils/adjtimex.c index 22fd39e8e..9f8227cf0 100644 --- a/miscutils/adjtimex.c +++ b/miscutils/adjtimex.c | |||
@@ -11,7 +11,7 @@ | |||
11 | * Licensed under GPLv2 or later, see file License in this tarball for details. | 11 | * Licensed under GPLv2 or later, see file License in this tarball for details. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "busybox.h" | 14 | #include "libbb.h" |
15 | #include <sys/timex.h> | 15 | #include <sys/timex.h> |
16 | 16 | ||
17 | static const struct {int bit; const char *name;} statlist[] = { | 17 | static const struct {int bit; const char *name;} statlist[] = { |
diff --git a/miscutils/bbconfig.c b/miscutils/bbconfig.c index 6896506e6..803d1d94b 100644 --- a/miscutils/bbconfig.c +++ b/miscutils/bbconfig.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | 1 | /* vi: set sw=4 ts=4: */ |
2 | /* This file was released into the public domain by Paul Fox. | 2 | /* This file was released into the public domain by Paul Fox. |
3 | */ | 3 | */ |
4 | #include "busybox.h" | 4 | #include "libbb.h" |
5 | #include "bbconfigopts.h" | 5 | #include "bbconfigopts.h" |
6 | 6 | ||
7 | int bbconfig_main(int argc, char **argv); | 7 | int bbconfig_main(int argc, char **argv); |
diff --git a/miscutils/chrt.c b/miscutils/chrt.c index f52c3cd1b..8a4b78fc4 100644 --- a/miscutils/chrt.c +++ b/miscutils/chrt.c | |||
@@ -6,10 +6,10 @@ | |||
6 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 6 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "busybox.h" | ||
10 | #include <unistd.h> | 9 | #include <unistd.h> |
11 | #include <sched.h> | 10 | #include <sched.h> |
12 | #include <getopt.h> /* optind */ | 11 | #include <getopt.h> /* optind */ |
12 | #include "libbb.h" | ||
13 | #ifndef _POSIX_PRIORITY_SCHEDULING | 13 | #ifndef _POSIX_PRIORITY_SCHEDULING |
14 | #warning your system may be foobared | 14 | #warning your system may be foobared |
15 | #endif | 15 | #endif |
diff --git a/miscutils/crond.c b/miscutils/crond.c index c7d1a6c50..a490d417f 100644 --- a/miscutils/crond.c +++ b/miscutils/crond.c | |||
@@ -12,7 +12,7 @@ | |||
12 | 12 | ||
13 | #define VERSION "2.3.2" | 13 | #define VERSION "2.3.2" |
14 | 14 | ||
15 | #include "busybox.h" | 15 | #include "libbb.h" |
16 | #include <sys/syslog.h> | 16 | #include <sys/syslog.h> |
17 | 17 | ||
18 | #define arysize(ary) (sizeof(ary)/sizeof((ary)[0])) | 18 | #define arysize(ary) (sizeof(ary)/sizeof((ary)[0])) |
diff --git a/miscutils/crontab.c b/miscutils/crontab.c index 02df85be8..76c382e8f 100644 --- a/miscutils/crontab.c +++ b/miscutils/crontab.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 | #ifndef CRONTABS | 15 | #ifndef CRONTABS |
16 | #define CRONTABS "/var/spool/cron/crontabs" | 16 | #define CRONTABS "/var/spool/cron/crontabs" |
diff --git a/miscutils/dc.c b/miscutils/dc.c index 1953a9489..872b814cd 100644 --- a/miscutils/dc.c +++ b/miscutils/dc.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 3 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include "busybox.h" | 6 | #include "libbb.h" |
7 | #include <math.h> | 7 | #include <math.h> |
8 | 8 | ||
9 | /* Tiny RPN calculator, because "expr" didn't give me bitwise operations. */ | 9 | /* Tiny RPN calculator, because "expr" didn't give me bitwise operations. */ |
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index d1a5163d2..0b08fb6e5 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c | |||
@@ -54,7 +54,7 @@ | |||
54 | Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia. | 54 | Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia. |
55 | */ | 55 | */ |
56 | 56 | ||
57 | #include "busybox.h" | 57 | #include "libbb.h" |
58 | #include "xregex.h" | 58 | #include "xregex.h" |
59 | #include <unistd.h> | 59 | #include <unistd.h> |
60 | #include <stdio.h> | 60 | #include <stdio.h> |
diff --git a/miscutils/eject.c b/miscutils/eject.c index 5d7ef1c28..631a344a1 100644 --- a/miscutils/eject.c +++ b/miscutils/eject.c | |||
@@ -13,7 +13,7 @@ | |||
13 | * Most of the dirty work blatantly ripped off from cat.c =) | 13 | * Most of the dirty work blatantly ripped off from cat.c =) |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "busybox.h" | 16 | #include "libbb.h" |
17 | 17 | ||
18 | /* various defines swiped from linux/cdrom.h */ | 18 | /* various defines swiped from linux/cdrom.h */ |
19 | #define CDROMCLOSETRAY 0x5319 /* pendant of CDROMEJECT */ | 19 | #define CDROMCLOSETRAY 0x5319 /* pendant of CDROMEJECT */ |
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index 0a689d87e..181ac5f6e 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * - by Mark Lord (C) 1994-2002 -- freely distributable | 12 | * - by Mark Lord (C) 1994-2002 -- freely distributable |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "busybox.h" | 15 | #include "libbb.h" |
16 | #include <linux/hdreg.h> | 16 | #include <linux/hdreg.h> |
17 | 17 | ||
18 | /* device types */ | 18 | /* device types */ |
diff --git a/miscutils/last.c b/miscutils/last.c index d354807e5..f38c4b878 100644 --- a/miscutils/last.c +++ b/miscutils/last.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 <utmp.h> | 11 | #include <utmp.h> |
12 | 12 | ||
13 | #ifndef SHUTDOWN_TIME | 13 | #ifndef SHUTDOWN_TIME |
diff --git a/miscutils/less.c b/miscutils/less.c index 138bd4711..3df1f3785 100644 --- a/miscutils/less.c +++ b/miscutils/less.c | |||
@@ -23,7 +23,7 @@ | |||
23 | 23 | ||
24 | #include <sched.h> /* sched_yield() */ | 24 | #include <sched.h> /* sched_yield() */ |
25 | 25 | ||
26 | #include "busybox.h" | 26 | #include "libbb.h" |
27 | #if ENABLE_FEATURE_LESS_REGEXP | 27 | #if ENABLE_FEATURE_LESS_REGEXP |
28 | #include "xregex.h" | 28 | #include "xregex.h" |
29 | #endif | 29 | #endif |
diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c index fce7ea43d..0ad12d798 100644 --- a/miscutils/makedevs.c +++ b/miscutils/makedevs.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * known bugs: can't deal with alpha ranges | 7 | * known bugs: can't deal with alpha ranges |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "busybox.h" | 10 | #include "libbb.h" |
11 | 11 | ||
12 | #ifdef CONFIG_FEATURE_MAKEDEVS_LEAF | 12 | #ifdef CONFIG_FEATURE_MAKEDEVS_LEAF |
13 | int makedevs_main(int argc, char **argv); | 13 | int makedevs_main(int argc, char **argv); |
diff --git a/miscutils/mountpoint.c b/miscutils/mountpoint.c index e380154ee..b5ce35cf1 100644 --- a/miscutils/mountpoint.c +++ b/miscutils/mountpoint.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * Based on sysvinit's mountpoint | 9 | * Based on sysvinit's mountpoint |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "busybox.h" | 12 | #include "libbb.h" |
13 | 13 | ||
14 | int mountpoint_main(int argc, char **argv); | 14 | int mountpoint_main(int argc, char **argv); |
15 | int mountpoint_main(int argc, char **argv) | 15 | int mountpoint_main(int argc, char **argv) |
diff --git a/miscutils/mt.c b/miscutils/mt.c index bed2969ca..2971421ef 100644 --- a/miscutils/mt.c +++ b/miscutils/mt.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 3 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include "busybox.h" | 6 | #include "libbb.h" |
7 | #include <sys/mtio.h> | 7 | #include <sys/mtio.h> |
8 | 8 | ||
9 | struct mt_opcodes { | 9 | struct mt_opcodes { |
diff --git a/miscutils/nmeter.c b/miscutils/nmeter.c index c96ce5da5..e15cc8c71 100644 --- a/miscutils/nmeter.c +++ b/miscutils/nmeter.c | |||
@@ -12,7 +12,7 @@ | |||
12 | // disk_io: (3,0):(22272,17897,410702,4375,54750) | 12 | // disk_io: (3,0):(22272,17897,410702,4375,54750) |
13 | // btime 1059401962 | 13 | // btime 1059401962 |
14 | 14 | ||
15 | #include "busybox.h" | 15 | #include "libbb.h" |
16 | #include <time.h> | 16 | #include <time.h> |
17 | 17 | ||
18 | typedef unsigned long long ullong; | 18 | typedef unsigned long long ullong; |
diff --git a/miscutils/raidautorun.c b/miscutils/raidautorun.c index c95b00aae..2b65d39bc 100644 --- a/miscutils/raidautorun.c +++ b/miscutils/raidautorun.c | |||
@@ -8,7 +8,7 @@ | |||
8 | * | 8 | * |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include "busybox.h" | 11 | #include "libbb.h" |
12 | 12 | ||
13 | #include <linux/major.h> | 13 | #include <linux/major.h> |
14 | #include <linux/raid/md_u.h> | 14 | #include <linux/raid/md_u.h> |
diff --git a/miscutils/readahead.c b/miscutils/readahead.c index 601e845bc..103ce8e5d 100644 --- a/miscutils/readahead.c +++ b/miscutils/readahead.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 readahead_main(int argc, char **argv); | 15 | int readahead_main(int argc, char **argv); |
16 | int readahead_main(int argc, char **argv) | 16 | int readahead_main(int argc, char **argv) |
diff --git a/miscutils/runlevel.c b/miscutils/runlevel.c index df2da2b1f..f7d55de0f 100644 --- a/miscutils/runlevel.c +++ b/miscutils/runlevel.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * initially busyboxified by Bernhard Fischer | 12 | * initially busyboxified by Bernhard Fischer |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "busybox.h" | 15 | #include "libbb.h" |
16 | #include <stdio.h> | 16 | #include <stdio.h> |
17 | #include <utmp.h> | 17 | #include <utmp.h> |
18 | #include <time.h> | 18 | #include <time.h> |
diff --git a/miscutils/rx.c b/miscutils/rx.c index 6e79f3438..675aad2a0 100644 --- a/miscutils/rx.c +++ b/miscutils/rx.c | |||
@@ -19,7 +19,7 @@ | |||
19 | * | 19 | * |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include "busybox.h" | 22 | #include "libbb.h" |
23 | 23 | ||
24 | #define SOH 0x01 | 24 | #define SOH 0x01 |
25 | #define STX 0x02 | 25 | #define STX 0x02 |
diff --git a/miscutils/setsid.c b/miscutils/setsid.c index 1abb54530..a976fe93b 100644 --- a/miscutils/setsid.c +++ b/miscutils/setsid.c | |||
@@ -14,7 +14,7 @@ | |||
14 | * - busyboxed | 14 | * - busyboxed |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "busybox.h" | 17 | #include "libbb.h" |
18 | 18 | ||
19 | int setsid_main(int argc, char **argv); | 19 | int setsid_main(int argc, char **argv); |
20 | int setsid_main(int argc, char **argv) | 20 | int setsid_main(int argc, char **argv) |
diff --git a/miscutils/strings.c b/miscutils/strings.c index 49f2cf31e..eff1bd947 100644 --- a/miscutils/strings.c +++ b/miscutils/strings.c | |||
@@ -7,11 +7,9 @@ | |||
7 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. | 7 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "busybox.h" | ||
11 | #include <stdio.h> | ||
12 | #include <stdlib.h> | ||
13 | #include <getopt.h> | 10 | #include <getopt.h> |
14 | #include <ctype.h> | 11 | |
12 | #include "libbb.h" | ||
15 | 13 | ||
16 | #define WHOLE_FILE 1 | 14 | #define WHOLE_FILE 1 |
17 | #define PRINT_NAME 2 | 15 | #define PRINT_NAME 2 |
diff --git a/miscutils/taskset.c b/miscutils/taskset.c index b3bf4902e..cd8ffc840 100644 --- a/miscutils/taskset.c +++ b/miscutils/taskset.c | |||
@@ -6,9 +6,9 @@ | |||
6 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 6 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "busybox.h" | ||
10 | #include <sched.h> | 9 | #include <sched.h> |
11 | #include <getopt.h> /* optind */ | 10 | #include <getopt.h> /* optind */ |
11 | #include "libbb.h" | ||
12 | 12 | ||
13 | #if ENABLE_FEATURE_TASKSET_FANCY | 13 | #if ENABLE_FEATURE_TASKSET_FANCY |
14 | #define TASKSET_PRINTF_MASK "%s" | 14 | #define TASKSET_PRINTF_MASK "%s" |
diff --git a/miscutils/time.c b/miscutils/time.c index a45919502..0a2e0b7e2 100644 --- a/miscutils/time.c +++ b/miscutils/time.c | |||
@@ -9,7 +9,7 @@ | |||
9 | Heavily modified for busybox by Erik Andersen <andersen@codepoet.org> | 9 | Heavily modified for busybox by Erik Andersen <andersen@codepoet.org> |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "busybox.h" | 12 | #include "libbb.h" |
13 | 13 | ||
14 | #define TV_MSEC tv_usec / 1000 | 14 | #define TV_MSEC tv_usec / 1000 |
15 | 15 | ||
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c index 28ae9bdb0..b64291b32 100644 --- a/miscutils/watchdog.c +++ b/miscutils/watchdog.c | |||
@@ -8,7 +8,7 @@ | |||
8 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. | 8 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include "busybox.h" | 11 | #include "libbb.h" |
12 | 12 | ||
13 | #define OPT_FOREGROUND 0x01 | 13 | #define OPT_FOREGROUND 0x01 |
14 | #define OPT_TIMER 0x02 | 14 | #define OPT_TIMER 0x02 |