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

Config.h

@@ -330,13 +330,9 @@
 #endif
 #endif
 //
-#if defined BB_FEATURE_LINUXRC || defined BB_LINUXRC
 #ifndef BB_INIT
-#define BB_INIT
+#undef BB_LINUXRC
-#endif
+#undef BB_FEATURE_LINUXRC
-#ifndef BB_LINUXRC
-#define BB_LINUXRC
-#endif
 #endif
 //
 #ifdef BB_GZIP

Makefile

@@ -81,24 +81,19 @@ CROSS =
 CC = $(CROSS)gcc
 STRIPTOOL = $(CROSS)strip
 
-# To compile vs an alternative libc, you may need to use/adjust
+# To compile vs uClibc, just use the compiler wrapper built by uClibc...
-# the following lines to meet your needs.  This is how I make
+# Isn't that easy?  Right now, uClibc needs BB_FEATURE_NFSMOUNT disabled 
-# busybox compile staticly with uClibc (needs BB_FEATURE_NFSMOUNT
+# since uClibc's nfs support isn't ready yet.
-# disabled at the moment).  Note the _full_ path for LIBCDIR.
+#CC = ../uClibc/extra/gcc-uClibc/gcc-uClibc-i386
-# This is because make doesn't do ~ expansion...
+
-#LIBCDIR=/home/andersen/CVS/uClibc
+# To compile vs some other alternative libc, you may need to use/adjust
+# the following lines to meet your needs...
+#LIBCDIR=/usr/i486-linuxlibc1/
 #LDFLAGS+=-nostdlib
 #LIBRARIES = $(LIBCDIR)/libc.a -lgcc
 #CROSS_CFLAGS+=-nostdinc -I$(LIBCDIR)/include -I$(GCCINCDIR)
 #GCCINCDIR = $(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp")
 
-# This is how I compile with the uClibc shared lib...
-#LIBCDIR=/home/andersen/CVS/uClibc
-#LDFLAGS+=-nostdlib
-#LIBRARIES = -luClibc -lgcc $(LIBCDIR)/crt0.o
-#CROSS_CFLAGS+=-nostdinc -I$(LIBCDIR)/include -I$(GCCINCDIR)
-#GCCINCDIR = $(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp")
-
 #--------------------------------------------------------
 
 # use '-Os' optimization if available, else use -O2

applets/busybox.c

@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <stdlib.h>
 
 #undef APPLET
 #undef APPLET_NOUSAGE

ar.c

@@ -23,6 +23,10 @@
  *
  */
 #include <fcntl.h>
+#include <string.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <unistd.h>
 #include "busybox.h"
 
 typedef struct ar_headers_s {

archival/ar.c

@@ -23,6 +23,10 @@
  *
  */
 #include <fcntl.h>
+#include <string.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <unistd.h>
 #include "busybox.h"
 
 typedef struct ar_headers_s {

archival/dpkg_deb.c

@@ -17,6 +17,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
 #include "busybox.h"
 
 typedef struct ar_headers_s {

archival/gzip.c

@@ -45,6 +45,7 @@
  */
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 #define memzero(s, n)     memset ((void *)(s), 0, (n))
 
 #ifndef RETSIGTYPE

archival/tar.c

@@ -52,6 +52,9 @@
 #include <sys/sysmacros.h>
 #include <getopt.h>
 #include <fnmatch.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 #ifdef BB_FEATURE_TAR_GZIP
 extern int unzip(int in, int out);

basename.c

@@ -22,7 +22,8 @@
  */
 
 #include "busybox.h"
-#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 extern int basename_main(int argc, char **argv)
 {

busybox.c

@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <stdlib.h>
 
 #undef APPLET
 #undef APPLET_NOUSAGE

busybox.h

@@ -26,19 +26,10 @@
 
 #include "Config.h"
 
-#include <stdlib.h>
+#include <stdio.h>
 #include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <sys/types.h>
-#include <mntent.h>
-#include <regex.h>
-/* for the _syscall() macros */
-#include <sys/syscall.h>
-#include <linux/unistd.h>
 
 #ifdef DMALLOC
 #include "dmalloc.h"
@@ -69,26 +60,6 @@ static inline int is_octal(ch)   { return ((ch >= '0') && (ch <= '7')); }
 #endif
 
 
-/* I don't like nested includes, but the string and io functions are used
- * too often
- */
-#include <stdio.h>
-#if !defined(NO_STRING_H) || defined(STDC_HEADERS)
-#  include <string.h>
-#  if !defined(STDC_HEADERS) && !defined(NO_MEMORY_H) && !defined(__GNUC__)
-#    include <memory.h>
-#  endif
-#  define memzero(s, n)     memset ((void *)(s), 0, (n))
-#else
-#  include <strings.h>
-#  define strchr            index
-#  define strrchr           rindex
-#  define memcpy(d, s, n)   bcopy((s), (d), (n))
-#  define memcmp(s1, s2, n) bcmp((s1), (s2), (n))
-#  define memzero(s, n)     bzero((s), (n))
-#endif
-
-
 enum Location {
 	_BB_DIR_ROOT = 0,
 	_BB_DIR_BIN,
@@ -179,7 +150,6 @@ extern void print_file(FILE *file);
 extern int print_file_by_name(char *filename);
 extern char process_escape_sequence(char **ptr);
 extern char *get_last_path_component(char *path);
-extern void xregcomp(regex_t *preg, const char *regex, int cflags);
 extern FILE *wfopen(const char *path, const char *mode);
 extern FILE *xfopen(const char *path, const char *mode);
 

cat.c

@@ -22,7 +22,7 @@
  */
 
 #include "busybox.h"
-#include <stdio.h>
+#include <stdlib.h>
 
 extern int cat_main(int argc, char **argv)
 {

chmod_chown_chgrp.c

@@ -29,6 +29,9 @@
 #include "messages.c"
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 
 static long uid = -1;

chroot.c

@@ -25,6 +25,7 @@
 #include "busybox.h"
 #include <stdlib.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <errno.h>
 
 int chroot_main(int argc, char **argv)

clear.c

@@ -24,6 +24,7 @@
 
 #include "busybox.h"
 #include <stdio.h>
+#include <stdlib.h>
 
 
 extern int clear_main(int argc, char **argv)

cmp.c

@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <stdlib.h>
 
 int cmp_main(int argc, char **argv)
 {

console-tools/clear.c

@@ -24,6 +24,7 @@
 
 #include "busybox.h"
 #include <stdio.h>
+#include <stdlib.h>
 
 
 extern int clear_main(int argc, char **argv)

console-tools/dumpkmap.c

@@ -24,6 +24,9 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
 #include <sys/ioctl.h>
 
 /* From <linux/kd.h> */

console-tools/loadkmap.c

@@ -24,6 +24,9 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include <sys/ioctl.h>
 
 #define BINARY_KEYMAP_MAGIC "bkeymap"

console-tools/reset.c

@@ -25,6 +25,7 @@
 
 #include "busybox.h"
 #include <stdio.h>
+#include <stdlib.h>
 
 extern int reset_main(int argc, char **argv)
 {

coreutils/basename.c

@@ -22,7 +22,8 @@
  */
 
 #include "busybox.h"
-#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 extern int basename_main(int argc, char **argv)
 {

coreutils/cat.c

@@ -22,7 +22,7 @@
  */
 
 #include "busybox.h"
-#include <stdio.h>
+#include <stdlib.h>
 
 extern int cat_main(int argc, char **argv)
 {

coreutils/chroot.c

@@ -25,6 +25,7 @@
 #include "busybox.h"
 #include <stdlib.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <errno.h>
 
 int chroot_main(int argc, char **argv)

coreutils/cmp.c

@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <stdlib.h>
 
 int cmp_main(int argc, char **argv)
 {

coreutils/date.c

@@ -31,6 +31,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <stdio.h>
+#include <string.h>
 #include <getopt.h>
 
 

coreutils/dd.c

@@ -24,6 +24,10 @@
 #include "busybox.h"
 
 #include <sys/types.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
 #include <fcntl.h>
 
 static struct suffix_mult dd_suffixes[] = {

coreutils/df.c

@@ -24,8 +24,10 @@
 
 #include "busybox.h"
 #include <stdio.h>
+#include <stdlib.h>
 #include <mntent.h>
 #include <sys/vfs.h>
+#include <getopt.h>
 
 extern const char mtab_file[];	/* Defined in utility.c */
 #ifdef BB_FEATURE_HUMAN_READABLE

coreutils/dirname.c

@@ -22,6 +22,8 @@
  */
 #include "busybox.h"
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 extern int dirname_main(int argc, char **argv)
 {

coreutils/du.c

@@ -31,6 +31,8 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
 #include <errno.h>
 
 #ifdef BB_FEATURE_HUMAN_READABLE
@@ -185,7 +187,7 @@ int du_main(int argc, char **argv)
 	return status;
 }
 
-/* $Id: du.c,v 1.34 2001/01/22 22:35:38 rjune Exp $ */
+/* $Id: du.c,v 1.35 2001/01/27 08:24:37 andersen Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"

coreutils/echo.c

@@ -24,6 +24,8 @@
 
 #include "busybox.h"
 #include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
 
 extern int 
 echo_main(int argc, char** argv)

coreutils/expr.c

@@ -35,9 +35,11 @@
 
 #include "busybox.h"
 #include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <regex.h>
 #include <sys/types.h>
 
-#include <regex.h>
 
 /* The kinds of value we can have.  */
 enum valtype {

coreutils/head.c

@@ -25,6 +25,8 @@
 #include "busybox.h"
 #include <errno.h>
 #include <stdio.h>
+#include <getopt.h>
+#include <stdlib.h>
 
 int head(int len, FILE *fp)
 {

coreutils/hostid.c

@@ -22,6 +22,8 @@
 
 #include "busybox.h"
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 extern int hostid_main(int argc, char **argv)
 {

coreutils/id.c

@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <getopt.h>
+#include <string.h>
 #include <sys/types.h>
 
 extern int id_main(int argc, char **argv)

coreutils/ln.c

@@ -28,7 +28,10 @@
 
 #include <stdio.h>
 #include <dirent.h>
+#include <string.h>
+#include <stdlib.h>
 #include <errno.h>
+#include <unistd.h>
 
 static const int LN_SYMLINK = 1;
 static const int LN_FORCE = 2;

coreutils/logname.c

@@ -22,6 +22,8 @@
 
 #include "busybox.h"
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 extern int logname_main(int argc, char **argv)
 {

coreutils/ls.c

@@ -59,6 +59,7 @@ static const int COLUMN_GAP = 2;			/* includes the file type char, if present */
 #include <time.h>
 #endif
 #include <string.h>
+#include <stdlib.h>
 
 #include <fcntl.h>
 #include <signal.h>

coreutils/mkdir.c

@@ -28,6 +28,8 @@
 
 #include <stdio.h>
 #include <errno.h>
+#include <string.h>
+#include <stdlib.h>
 
 static int parentFlag = FALSE;
 static mode_t mode = 0777;

coreutils/mkfifo.c

@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <errno.h>
+#include <stdlib.h>
 
 extern int mkfifo_main(int argc, char **argv)
 {

coreutils/mknod.c

@@ -26,6 +26,8 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
 
 int mknod_main(int argc, char **argv)
 {

coreutils/pwd.c

@@ -25,6 +25,8 @@
 #include <stdio.h>
 #include <dirent.h>
 #include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
 
 extern int pwd_main(int argc, char **argv)
 {

coreutils/rm.c

@@ -28,6 +28,8 @@
 #include <utime.h>
 #include <dirent.h>
 #include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
 
 static int recursiveFlag = FALSE;
 static int forceFlag = FALSE;

coreutils/rmdir.c

@@ -25,6 +25,8 @@
 #include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
 
 extern int rmdir_main(int argc, char **argv)
 {

coreutils/sleep.c

@@ -23,6 +23,8 @@
 
 #include "busybox.h"
 #include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
 
 extern int sleep_main(int argc, char **argv)
 {

coreutils/sort.c

@@ -22,6 +22,8 @@
  */
 
 #include "busybox.h"
+#include <getopt.h>
+#include <stdlib.h>
 
 int compare_ascii(const void *x, const void *y)
 {

coreutils/sync.c

@@ -23,6 +23,7 @@
 
 #include "busybox.h"
 #include <stdio.h>
+#include <unistd.h>
 
 extern int sync_main(int argc, char **argv)
 {

coreutils/tail.c

@@ -23,8 +23,12 @@
 
 #include "busybox.h"
 
-#include <sys/types.h>
 #include <fcntl.h>
+#include <getopt.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
 
 static struct suffix_mult tail_suffixes[] = {
 	{ "b", 512 },

coreutils/touch.c

@@ -28,6 +28,8 @@
 #include <fcntl.h>
 #include <utime.h>
 #include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
 
 extern int touch_main(int argc, char **argv)
 {

coreutils/tr.c

@@ -191,9 +191,9 @@ extern int tr_main(int argc, char **argv)
 			map(input, input_length, output, output_length);
 		}
 		for (i = 0; i < input_length; i++)
-			invec[input[i]] = TRUE;
+			invec[(int)input[i]] = TRUE;
 		for (i = 0; i < output_length; i++)
-			outvec[output[i]] = TRUE;
+			outvec[(int)output[i]] = TRUE;
 	}
 	convert();
 	return (0);

coreutils/tty.c

@@ -22,6 +22,8 @@
 
 #include "busybox.h"
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include <sys/types.h>
 
 extern int tty_main(int argc, char **argv)

coreutils/uname.c

@@ -33,6 +33,7 @@
 
 #include "busybox.h"
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
 

coreutils/uniq.c

@@ -26,7 +26,9 @@
 #include "busybox.h"
 #include <stdio.h>
 #include <string.h>
+#include <getopt.h>
 #include <errno.h>
+#include <stdlib.h>
 
 static int print_count;
 static int print_uniq = 1;

coreutils/uudecode.c

@@ -27,6 +27,10 @@
 #include <stdio.h>
 #include <errno.h>
 #include <getopt.h>
+#include <string.h>
+#include <stdlib.h>
+#include "pwd_grp/pwd.h"
+#include "pwd_grp/grp.h"
 
 /*struct passwd *getpwnam();*/
 

coreutils/uuencode.c

@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <getopt.h>
+#include <stdlib.h>
 
 #define	RW (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
 

coreutils/wc.c

@@ -23,6 +23,7 @@
 #include "busybox.h"
 #include <stdio.h>
 #include <getopt.h>
+#include <stdlib.h>
 
 static int total_lines, total_words, total_chars, max_length;
 static int print_lines, print_words, print_chars, print_length;

coreutils/whoami.c

@@ -22,6 +22,8 @@
 
 #include "busybox.h"
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 extern int whoami_main(int argc, char **argv)
 {

coreutils/yes.c

@@ -22,6 +22,7 @@
 
 #include "busybox.h"
 #include <stdio.h>
+#include <stdlib.h>
 
 extern int yes_main(int argc, char **argv)
 {

cp_mv.c

@@ -42,6 +42,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <getopt.h>
+#include <stdlib.h>
 
 static const int is_cp = 0;
 static const int is_mv = 1;

date.c

@@ -31,6 +31,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <stdio.h>
+#include <string.h>
 #include <getopt.h>
 
 

dd.c

@@ -24,6 +24,10 @@
 #include "busybox.h"
 
 #include <sys/types.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
 #include <fcntl.h>
 
 static struct suffix_mult dd_suffixes[] = {

df.c

@@ -24,8 +24,10 @@
 
 #include "busybox.h"
 #include <stdio.h>
+#include <stdlib.h>
 #include <mntent.h>
 #include <sys/vfs.h>
+#include <getopt.h>
 
 extern const char mtab_file[];	/* Defined in utility.c */
 #ifdef BB_FEATURE_HUMAN_READABLE

dirname.c

@@ -22,6 +22,8 @@
  */
 #include "busybox.h"
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 extern int dirname_main(int argc, char **argv)
 {

dmesg.c

@@ -18,9 +18,11 @@
 #include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <getopt.h>
 
 #if __GNU_LIBRARY__ < 5
-
+#include <sys/syscall.h>
+#include <linux/unistd.h>
 #ifndef __alpha__
 # define __NR_klogctl __NR_syslog
 static inline _syscall3(int, klogctl, int, type, char *, b, int, len);

dpkg_deb.c

@@ -17,6 +17,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
 #include "busybox.h"
 
 typedef struct ar_headers_s {

du.c

@@ -31,6 +31,8 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
 #include <errno.h>
 
 #ifdef BB_FEATURE_HUMAN_READABLE
@@ -185,7 +187,7 @@ int du_main(int argc, char **argv)
 	return status;
 }
 
-/* $Id: du.c,v 1.34 2001/01/22 22:35:38 rjune Exp $ */
+/* $Id: du.c,v 1.35 2001/01/27 08:24:37 andersen Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"

dumpkmap.c

@@ -24,6 +24,9 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
 #include <sys/ioctl.h>
 
 /* From <linux/kd.h> */

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]);
 		}
 	}
 

echo.c

@@ -24,6 +24,8 @@
 
 #include "busybox.h"
 #include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
 
 extern int 
 echo_main(int argc, char** argv)

editors/sed.c

@@ -47,9 +47,11 @@
 #include <string.h> /* for strdup() */
 #include <errno.h>
 #include <ctype.h> /* for isspace() */
+#include <stdlib.h>
 #include "busybox.h"
 
 /* externs */
+extern void xregcomp(regex_t *preg, const char *regex, int cflags);
 extern int optind; /* in unistd.h */
 extern char *optarg; /* ditto */
 

expr.c

@@ -35,9 +35,11 @@
 
 #include "busybox.h"
 #include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <regex.h>
 #include <sys/types.h>
 
-#include <regex.h>
 
 /* The kinds of value we can have.  */
 enum valtype {

fbset.c

@@ -31,6 +31,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <ctype.h>
+#include <string.h>
 #include <sys/ioctl.h>
 
 #define DEFAULTFBDEV  "/dev/fb0"

fdflush.c

@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
+#include <stdlib.h>
 
 /* From <linux/fd.h> */
 #define FDFLUSH  _IO(2,0x4b)

find.c

@@ -26,6 +26,8 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <dirent.h>
+#include <string.h>
+#include <stdlib.h>
 
 
 static char *pattern = NULL;

findutils/find.c

@@ -26,6 +26,8 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <dirent.h>
+#include <string.h>
+#include <stdlib.h>
 
 
 static char *pattern = NULL;

findutils/grep.c

@@ -28,6 +28,8 @@
 #include <errno.h>
 #include "busybox.h"
 
+extern void xregcomp(regex_t *preg, const char *regex, int cflags);
+
 extern int optind; /* in unistd.h */
 extern int errno;  /* for use with strerror() */
 

findutils/which.c

@@ -22,7 +22,9 @@
  */
 
 #include "busybox.h"
+#include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 extern int which_main(int argc, char **argv)
 {

free.c

@@ -24,6 +24,7 @@
 #include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
+#include <stdlib.h>
 
 extern int free_main(int argc, char **argv)
 {

freeramdisk.c

@@ -27,6 +27,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <errno.h>
+#include <stdlib.h>
 #include "busybox.h"
 
 

grep.c

@@ -28,6 +28,8 @@
 #include <errno.h>
 #include "busybox.h"
 
+extern void xregcomp(regex_t *preg, const char *regex, int cflags);
+
 extern int optind; /* in unistd.h */
 extern int errno;  /* for use with strerror() */
 

gzip.c

@@ -45,6 +45,7 @@
  */
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 #define memzero(s, n)     memset ((void *)(s), 0, (n))
 
 #ifndef RETSIGTYPE

head.c

@@ -25,6 +25,8 @@
 #include "busybox.h"
 #include <errno.h>
 #include <stdio.h>
+#include <getopt.h>
+#include <stdlib.h>
 
 int head(int len, FILE *fp)
 {

hostid.c

@@ -22,6 +22,8 @@
 
 #include "busybox.h"
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 extern int hostid_main(int argc, char **argv)
 {

hostname.c

@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: hostname.c,v 1.20 2001/01/24 18:44:54 andersen Exp $
+ * $Id: hostname.c,v 1.21 2001/01/27 08:24:37 andersen Exp $
  * Mini hostname implementation for busybox
  *
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -28,6 +28,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <unistd.h>
+#include <string.h>
 #include <stdio.h>
 
 void do_sethostname(char *s, int isfile)

id.c

@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <getopt.h>
+#include <string.h>
 #include <sys/types.h>
 
 extern int id_main(int argc, char **argv)

include/busybox.h

@@ -26,19 +26,10 @@
 
 #include "Config.h"
 
-#include <stdlib.h>
+#include <stdio.h>
 #include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <sys/types.h>
-#include <mntent.h>
-#include <regex.h>
-/* for the _syscall() macros */
-#include <sys/syscall.h>
-#include <linux/unistd.h>
 
 #ifdef DMALLOC
 #include "dmalloc.h"
@@ -69,26 +60,6 @@ static inline int is_octal(ch)   { return ((ch >= '0') && (ch <= '7')); }
 #endif
 
 
-/* I don't like nested includes, but the string and io functions are used
- * too often
- */
-#include <stdio.h>
-#if !defined(NO_STRING_H) || defined(STDC_HEADERS)
-#  include <string.h>
-#  if !defined(STDC_HEADERS) && !defined(NO_MEMORY_H) && !defined(__GNUC__)
-#    include <memory.h>
-#  endif
-#  define memzero(s, n)     memset ((void *)(s), 0, (n))
-#else
-#  include <strings.h>
-#  define strchr            index
-#  define strrchr           rindex
-#  define memcpy(d, s, n)   bcopy((s), (d), (n))
-#  define memcmp(s1, s2, n) bcmp((s1), (s2), (n))
-#  define memzero(s, n)     bzero((s), (n))
-#endif
-
-
 enum Location {
 	_BB_DIR_ROOT = 0,
 	_BB_DIR_BIN,
@@ -179,7 +150,6 @@ extern void print_file(FILE *file);
 extern int print_file_by_name(char *filename);
 extern char process_escape_sequence(char **ptr);
 extern char *get_last_path_component(char *path);
-extern void xregcomp(regex_t *preg, const char *regex, int cflags);
 extern FILE *wfopen(const char *path, const char *mode);
 extern FILE *xfopen(const char *path, const char *mode);
 

include/grp.h

@@ -5,16 +5,6 @@
 #include <grp.h>
 #else
 
-#define bb_setgrent setgrent
-#define bb_endgrent endgrent
-#define bb_getgrent getgrent
-#define bb_getgrgid getgrgid
-#define bb_getgrnam getgrnam
-#define bb_fgetgrent fgetgrent
-#define bb_setgroups setgroups
-#define bb_initgroups initgroups
-#define __bb_getgrent __getgrent
-
 #include <sys/types.h>
 #include <features.h>
 #include <stdio.h>
@@ -28,19 +18,19 @@ struct group
   char **gr_mem;		/* Member list.	*/
 };
 
-extern void bb_setgrent __P ((void));
+extern void setgrent __P ((void));
-extern void bb_endgrent __P ((void));
+extern void endgrent __P ((void));
-extern struct group * bb_getgrent __P ((void));
+extern struct group * getgrent __P ((void));
 
-extern struct group * bb_getgrgid __P ((__const gid_t gid));
+extern struct group * getgrgid __P ((__const gid_t gid));
-extern struct group * bb_getgrnam __P ((__const char * name));
+extern struct group * getgrnam __P ((__const char * name));
 
-extern struct group * bb_fgetgrent __P ((FILE * file));
+extern struct group * fgetgrent __P ((FILE * file));
 
-extern int bb_setgroups __P ((size_t n, __const gid_t * groups));
+extern int setgroups __P ((size_t n, __const gid_t * groups));
-extern int bb_initgroups __P ((__const char * user, gid_t gid));
+extern int initgroups __P ((__const char * user, gid_t gid));
 
-extern struct group * __bb_getgrent __P ((int grp_fd));
+extern struct group * __getgrent __P ((int grp_fd));
 
 #endif /* USE_SYSTEM_PWD_GRP */
 #endif /* __BB_GRP_H */

include/pwd.h

@@ -5,17 +5,6 @@
 #include <pwd.h>
 #else
 
-#define bb_setpwent setpwent
-#define bb_endpwent endpwent
-#define bb_getpwent getpwent
-#define bb_putpwent putpwent
-#define bb_getpw getpw
-#define bb_fgetpwent fgetpwent
-#define bb_getpwuid getpwuid
-#define bb_getpwnam getpwnam
-#define __bb_getpwent __bb_getpwent
-
-
 #include <sys/types.h>
 #include <features.h>
 #include <stdio.h>
@@ -32,19 +21,19 @@ struct passwd
   char *pw_shell;		/* Shell program.  */
 };
 
-extern void bb_setpwent __P ((void));
+extern void setpwent __P ((void));
-extern void bb_endpwent __P ((void));
+extern void endpwent __P ((void));
-extern struct passwd * bb_getpwent __P ((void));
+extern struct passwd * getpwent __P ((void));
 
-extern int bb_putpwent __P ((__const struct passwd * __p, FILE * __f));
+extern int putpwent __P ((__const struct passwd * __p, FILE * __f));
-extern int bb_getpw __P ((uid_t uid, char *buf));
+extern int getpw __P ((uid_t uid, char *buf));
 
-extern struct passwd * bb_fgetpwent __P ((FILE * file));
+extern struct passwd * fgetpwent __P ((FILE * file));
 
-extern struct passwd * bb_getpwuid __P ((__const uid_t));
+extern struct passwd * getpwuid __P ((__const uid_t));
-extern struct passwd * bb_getpwnam __P ((__const char *));
+extern struct passwd * getpwnam __P ((__const char *));
 
-extern struct passwd * __bb_getpwent __P ((__const int passwd_fd));
+extern struct passwd * __getpwent __P ((__const int passwd_fd));
 
 #endif /* USE_SYSTEM_PWD_GRP */
 #endif /* __BB_PWD_H  */

init.c

@@ -37,6 +37,7 @@
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
+#include <limits.h>
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
@@ -114,6 +115,8 @@ static const int RB_AUTOBOOT = 0x01234567;
 #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__ */
 

init/init.c

@@ -37,6 +37,7 @@
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
+#include <limits.h>
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
@@ -114,6 +115,8 @@ static const int RB_AUTOBOOT = 0x01234567;
 #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__ */
 

insmod.c

@@ -46,8 +46,11 @@
 #include <dirent.h>
 #include <ctype.h>
 #include <assert.h>
+#include <string.h>
 #include <getopt.h>
 #include <sys/utsname.h>
+#include <sys/syscall.h>
+#include <linux/unistd.h>
 
 //----------------------------------------------------------------------------
 //--------modutils module.h, lines 45-242
@@ -78,7 +81,7 @@
 #ifndef MODUTILS_MODULE_H
 static const int MODUTILS_MODULE_H = 1;
 
-#ident "$Id: insmod.c,v 1.42 2001/01/26 02:23:57 andersen Exp $"
+#ident "$Id: insmod.c,v 1.43 2001/01/27 08:24:37 andersen Exp $"
 
 /* This file contains the structures used by the 2.0 and 2.1 kernels.
    We do not use the kernel headers directly because we do not wish
@@ -284,7 +287,7 @@ int delete_module(const char *);
 #ifndef MODUTILS_OBJ_H
 static const int MODUTILS_OBJ_H = 1;
 
-#ident "$Id: insmod.c,v 1.42 2001/01/26 02:23:57 andersen Exp $"
+#ident "$Id: insmod.c,v 1.43 2001/01/27 08:24:37 andersen Exp $"
 
 /* The relocatable object is manipulated using elfin types.  */
 

kill.c

@@ -28,6 +28,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <ctype.h>
+#include <string.h>
 #include <unistd.h>
 
 static const int KILL = 0;

ln.c

@@ -28,7 +28,10 @@
 
 #include <stdio.h>
 #include <dirent.h>
+#include <string.h>
+#include <stdlib.h>
 #include <errno.h>
+#include <unistd.h>
 
 static const int LN_SYMLINK = 1;
 static const int LN_FORCE = 2;

loadkmap.c

@@ -24,6 +24,9 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include <sys/ioctl.h>
 
 #define BINARY_KEYMAP_MAGIC "bkeymap"

logger.c

@@ -27,6 +27,8 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
 
 #if !defined BB_SYSLOGD
 

logname.c

@@ -22,6 +22,8 @@
 
 #include "busybox.h"
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 extern int logname_main(int argc, char **argv)
 {

ls.c

@@ -59,6 +59,7 @@ static const int COLUMN_GAP = 2;			/* includes the file type char, if present */
 #include <time.h>
 #endif
 #include <string.h>
+#include <stdlib.h>
 
 #include <fcntl.h>
 #include <signal.h>

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]);
 		}
 	}
 

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)
 {

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>
 

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)
 {