Fix header file usage -- there were many unnecessary header files included in

busybox.h which slowed compiles.  I left only what was needed and then fixed up
all the apps to include their own header files.  I also fixed naming for pwd.h
and grp.h functions.  Tested to compile and run with libc5, glibc, and uClibc.
 -Erik

6 files changed, 12 insertions, 1 deletions

diff --git a/miscutils/dutmp.c b/miscutils/dutmp.c
index efd15dfbf..7e1d2eed7 100644
--- a/miscutils/dutmp.c
+++ b/miscutils/dutmp.c
@@ -21,6 +21,8 @@
 #define bb_need_io_error
 #include "messages.c"
 #include <utmp.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 extern int dutmp_main(int argc, char **argv)
 {
@@ -35,7 +37,7 @@ extern int dutmp_main(int argc, char **argv)
 	} else  {
 		file = open(argv[1], O_RDONLY);
 		if (file < 0) {
-			error_msg_and_die(io_error, argv[1], strerror(errno));
+			perror_msg_and_die(io_error, argv[1]);
 		}
 	}
 
diff --git a/miscutils/mktemp.c b/miscutils/mktemp.c
index 2d53cc2a4..3b9f2b22c 100644
--- a/miscutils/mktemp.c
+++ b/miscutils/mktemp.c
@@ -25,6 +25,8 @@
 #include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
 
 extern int mktemp_main(int argc, char **argv)
 {
diff --git a/miscutils/mt.c b/miscutils/mt.c
index 70d03cca4..0d28339b9 100644
--- a/miscutils/mt.c
+++ b/miscutils/mt.c
@@ -1,6 +1,7 @@
 /* vi: set sw=4 ts=4: */
 #include "busybox.h"
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/mtio.h>
 #include <sys/fcntl.h>
 
diff --git a/miscutils/readlink.c b/miscutils/readlink.c
index bb2056a25..98f1dea4f 100644
--- a/miscutils/readlink.c
+++ b/miscutils/readlink.c
@@ -25,6 +25,7 @@
 #include "busybox.h"
 #include <errno.h>
 #include <unistd.h>
+#include <stdlib.h>
 
 int readlink_main(int argc, char **argv)
 {
diff --git a/miscutils/update.c b/miscutils/update.c
index 080cb99c3..309ce0cbd 100644
--- a/miscutils/update.c
+++ b/miscutils/update.c
@@ -32,11 +32,14 @@
 #include <sys/param.h>
 #include <sys/syslog.h>
 #include <unistd.h> /* for getopt() */
+#include <stdlib.h>
 
 
 #if defined(__GLIBC__)
 #include <sys/kdaemon.h>
 #else
+#include <sys/syscall.h>
+#include <linux/unistd.h>
 static _syscall2(int, bdflush, int, func, int, data);
 #endif /* __GLIBC__ */
 
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index d297afa02..7026cc005 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -23,6 +23,8 @@
 #include "busybox.h"
 #include <stdio.h>
 #include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
 
 extern int watchdog_main(int argc, char **argv)
 {