diff options
| -rw-r--r-- | Config.h | 3 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | applets.h | 3 | ||||
| -rw-r--r-- | applets/usage.h | 7 | ||||
| -rw-r--r-- | cmdedit.c | 2 | ||||
| -rw-r--r-- | coreutils/ls.c | 1 | ||||
| -rw-r--r-- | include/applets.h | 3 | ||||
| -rw-r--r-- | include/libbb.h | 2 | ||||
| -rw-r--r-- | include/usage.h | 7 | ||||
| -rw-r--r-- | init.c | 2 | ||||
| -rw-r--r-- | init/init.c | 2 | ||||
| -rw-r--r-- | libbb/libbb.h | 2 | ||||
| -rw-r--r-- | logger.c | 21 | ||||
| -rw-r--r-- | ls.c | 1 | ||||
| -rw-r--r-- | procps/ps.c | 1 | ||||
| -rw-r--r-- | ps.c | 1 | ||||
| -rw-r--r-- | shell/cmdedit.c | 2 | ||||
| -rw-r--r-- | sysklogd/logger.c | 21 | ||||
| -rw-r--r-- | usage.h | 7 |
19 files changed, 62 insertions, 28 deletions
@@ -75,11 +75,12 @@ #define BB_MKNOD #define BB_MKSWAP //#define BB_MKTEMP -//#define BB_NC +#define BB_MODPROBE #define BB_MORE #define BB_MOUNT //#define BB_MT #define BB_MV +//#define BB_NC //#define BB_NSLOOKUP //#define BB_PING //#define BB_PIVOT_ROOT @@ -351,7 +351,7 @@ busybox.links: busybox.mkll Config.h applets.h nfsmount.o cmdedit.o: %.o: %.h sh.o: cmdedit.h $(OBJECTS): %.o: %.c Config.h busybox.h applets.h Makefile - $(CC) -I- $(CFLAGS) -I. $(patsubst %,-I%,$(subst :, ,$(BB_SRC_DIR))) -c $< -o $*.o + $(CC) $(CFLAGS) -I. $(patsubst %,-I%,$(subst :, ,$(BB_SRC_DIR))) -c $< -o $*.o $(PWD_OBJS): %.o: %.c Config.h busybox.h applets.h Makefile - mkdir -p $(PWD_GRP) @@ -263,6 +263,9 @@ #ifdef BB_MKTEMP APPLET(mktemp, mktemp_main, _BB_DIR_BIN) #endif +#ifdef BB_MODPROBE + APPLET(modprobe, modprobe_main, _BB_DIR_SBIN) +#endif #ifdef BB_MORE APPLET(more, more_main, _BB_DIR_BIN) #endif diff --git a/applets/usage.h b/applets/usage.h index b0b9722ad..2a2042292 100644 --- a/applets/usage.h +++ b/applets/usage.h @@ -1084,6 +1084,13 @@ "$ ls -la /tmp/temp.mWiLjM\n" \ "-rw------- 1 andersen andersen 0 Apr 25 17:10 /tmp/temp.mWiLjM\n" +#define modprobe_trivial_usage \ + "[FILE ...]" +#define modprobe_full_usage \ + "Used for hight level module loading and unloading." +#define modprobe_example_usage \ + "$ modprobe cdrom\n" + #define more_trivial_usage \ "[FILE ...]" #define more_full_usage \ @@ -170,7 +170,7 @@ static void cmdedit_setwidth(int w, int redraw_flg); static void win_changed(int nsig) { struct winsize win = { 0, 0, 0, 0 }; - static __sighandler_t previous_SIGWINCH_handler; /* for reset */ + static sighandler_t previous_SIGWINCH_handler; /* for reset */ /* emulate || signal call */ if (nsig == -SIGWINCH || nsig == SIGWINCH) { diff --git a/coreutils/ls.c b/coreutils/ls.c index 10191476e..794a1d028 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c @@ -61,6 +61,7 @@ enum { #include <stdlib.h> #include <fcntl.h> #include <signal.h> +#include <termios.h> #include <sys/ioctl.h> #include "busybox.h" diff --git a/include/applets.h b/include/applets.h index 12a28d5be..1fb6dcd92 100644 --- a/include/applets.h +++ b/include/applets.h @@ -263,6 +263,9 @@ #ifdef BB_MKTEMP APPLET(mktemp, mktemp_main, _BB_DIR_BIN) #endif +#ifdef BB_MODPROBE + APPLET(modprobe, modprobe_main, _BB_DIR_SBIN) +#endif #ifdef BB_MORE APPLET(more, more_main, _BB_DIR_BIN) #endif diff --git a/include/libbb.h b/include/libbb.h index bf5f0c1c5..c167e10bc 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -41,7 +41,7 @@ #include "../busybox.h" #endif -#if __GNU_LIBRARY__ < 5 +#if (__GNU_LIBRARY__ < 5) && (!defined __dietlibc__) /* libc5 doesn't define socklen_t */ typedef unsigned int socklen_t; /* libc5 doesn't implement BSD 4.4 daemon() */ diff --git a/include/usage.h b/include/usage.h index b0b9722ad..2a2042292 100644 --- a/include/usage.h +++ b/include/usage.h @@ -1084,6 +1084,13 @@ "$ ls -la /tmp/temp.mWiLjM\n" \ "-rw------- 1 andersen andersen 0 Apr 25 17:10 /tmp/temp.mWiLjM\n" +#define modprobe_trivial_usage \ + "[FILE ...]" +#define modprobe_full_usage \ + "Used for hight level module loading and unloading." +#define modprobe_example_usage \ + "$ modprobe cdrom\n" + #define more_trivial_usage \ "[FILE ...]" #define more_full_usage \ @@ -84,7 +84,7 @@ static const int RB_DISABLE_CAD = 0; static const int RB_AUTOBOOT = 0x01234567; #endif -#if __GNU_LIBRARY__ > 5 +#if (__GNU_LIBRARY__ > 5) || defined(__dietlibc__) #include <sys/reboot.h> #define init_reboot(magic) reboot(magic) #else diff --git a/init/init.c b/init/init.c index e057caa7e..ec144ea85 100644 --- a/init/init.c +++ b/init/init.c @@ -84,7 +84,7 @@ static const int RB_DISABLE_CAD = 0; static const int RB_AUTOBOOT = 0x01234567; #endif -#if __GNU_LIBRARY__ > 5 +#if (__GNU_LIBRARY__ > 5) || defined(__dietlibc__) #include <sys/reboot.h> #define init_reboot(magic) reboot(magic) #else diff --git a/libbb/libbb.h b/libbb/libbb.h index bf5f0c1c5..c167e10bc 100644 --- a/libbb/libbb.h +++ b/libbb/libbb.h @@ -41,7 +41,7 @@ #include "../busybox.h" #endif -#if __GNU_LIBRARY__ < 5 +#if (__GNU_LIBRARY__ < 5) && (!defined __dietlibc__) /* libc5 doesn't define socklen_t */ typedef unsigned int socklen_t; /* libc5 doesn't implement BSD 4.4 daemon() */ @@ -36,17 +36,18 @@ #include <sys/syslog.h> #else -/* We have to do this since the header file defines static - * structures. Argh.... bad libc, bad, bad... - */ #include <sys/syslog.h> - -typedef struct _code { - char *c_name; - int c_val; -} CODE; -extern CODE prioritynames[]; -extern CODE facilitynames[]; +# ifndef __dietlibc__ + /* We have to do this since the header file defines static + * structures. Argh.... bad libc, bad, bad... + */ + typedef struct _code { + char *c_name; + int c_val; + } CODE; + extern CODE prioritynames[]; + extern CODE facilitynames[]; +# endif #endif /* Decode a symbolic name to a numeric value @@ -61,6 +61,7 @@ enum { #include <stdlib.h> #include <fcntl.h> #include <signal.h> +#include <termios.h> #include <sys/ioctl.h> #include "busybox.h" diff --git a/procps/ps.c b/procps/ps.c index 7afb0091f..9e96a5402 100644 --- a/procps/ps.c +++ b/procps/ps.c @@ -36,6 +36,7 @@ #include <fcntl.h> #include <ctype.h> #include <string.h> +#include <termios.h> #include <sys/ioctl.h> #include "busybox.h" @@ -36,6 +36,7 @@ #include <fcntl.h> #include <ctype.h> #include <string.h> +#include <termios.h> #include <sys/ioctl.h> #include "busybox.h" diff --git a/shell/cmdedit.c b/shell/cmdedit.c index 69f833747..3b4750455 100644 --- a/shell/cmdedit.c +++ b/shell/cmdedit.c @@ -170,7 +170,7 @@ static void cmdedit_setwidth(int w, int redraw_flg); static void win_changed(int nsig) { struct winsize win = { 0, 0, 0, 0 }; - static __sighandler_t previous_SIGWINCH_handler; /* for reset */ + static sighandler_t previous_SIGWINCH_handler; /* for reset */ /* emulate || signal call */ if (nsig == -SIGWINCH || nsig == SIGWINCH) { diff --git a/sysklogd/logger.c b/sysklogd/logger.c index 623a4f9e5..9f730915f 100644 --- a/sysklogd/logger.c +++ b/sysklogd/logger.c @@ -36,17 +36,18 @@ #include <sys/syslog.h> #else -/* We have to do this since the header file defines static - * structures. Argh.... bad libc, bad, bad... - */ #include <sys/syslog.h> - -typedef struct _code { - char *c_name; - int c_val; -} CODE; -extern CODE prioritynames[]; -extern CODE facilitynames[]; +# ifndef __dietlibc__ + /* We have to do this since the header file defines static + * structures. Argh.... bad libc, bad, bad... + */ + typedef struct _code { + char *c_name; + int c_val; + } CODE; + extern CODE prioritynames[]; + extern CODE facilitynames[]; +# endif #endif /* Decode a symbolic name to a numeric value @@ -1084,6 +1084,13 @@ "$ ls -la /tmp/temp.mWiLjM\n" \ "-rw------- 1 andersen andersen 0 Apr 25 17:10 /tmp/temp.mWiLjM\n" +#define modprobe_trivial_usage \ + "[FILE ...]" +#define modprobe_full_usage \ + "Used for hight level module loading and unloading." +#define modprobe_example_usage \ + "$ modprobe cdrom\n" + #define more_trivial_usage \ "[FILE ...]" #define more_full_usage \ |