Some #include updates.

-Erik
2000-08-10 17:59:11 +00:00 · 2000-08-10 17:59:11 +00:00 · 88f50b6bf5
commit 88f50b6bf5
parent 40406e6bad
53 changed files with 12 additions and 57 deletions
--- a/applets/busybox.c
+++ b/applets/busybox.c
@ -32,7 +32,7 @@ const struct BB_applet applets[] = {
 	{"chown", chmod_chown_chgrp_main, _BB_DIR_BIN, chown_usage},
 #endif
 #ifdef BB_CHROOT
-	{"chroot", chroot_main, _BB_DIR_SBIN, chroot_usage},
+	{"chroot", chroot_main, _BB_DIR_USR_SBIN, chroot_usage},
 #endif
 #ifdef BB_CLEAR
 	{"clear", clear_main, _BB_DIR_USR_BIN, clear_usage},
@ -65,7 +65,7 @@ const struct BB_applet applets[] = {
 	{"dmesg", dmesg_main, _BB_DIR_BIN, dmesg_usage},
 #endif
 #ifdef BB_DU
-	{"du", du_main, _BB_DIR_BIN, du_usage},
+	{"du", du_main, _BB_DIR_USR_BIN, du_usage},
 #endif
 #ifdef BB_DUMPKMAP
 	{"dumpkmap", dumpkmap_main, _BB_DIR_BIN, dumpkmap_usage},
@ -251,7 +251,7 @@ const struct BB_applet applets[] = {
 	{"sleep", sleep_main, _BB_DIR_BIN, sleep_usage},
 #endif
 #ifdef BB_SORT
-	{"sort", sort_main, _BB_DIR_BIN, sort_usage},
+	{"sort", sort_main, _BB_DIR_USR_BIN, sort_usage},
 #endif
 #ifdef BB_SYNC
 	{"sync", sync_main, _BB_DIR_BIN, sync_usage},
@ -278,7 +278,7 @@ const struct BB_applet applets[] = {
 	{"test", test_main, _BB_DIR_USR_BIN, test_usage},
 #endif
 #ifdef BB_TEE
-	{"tee", tee_main, _BB_DIR_BIN, tee_usage},
+	{"tee", tee_main, _BB_DIR_USR_BIN, tee_usage},
 #endif
 #ifdef BB_TOUCH
 	{"touch", touch_main, _BB_DIR_USR_BIN, touch_usage},
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@ -94,7 +94,6 @@ static char *license_msg[] = {
 #include <ctype.h>
 #include <sys/types.h>
 #include <signal.h>
-#include <sys/stat.h>
 #include <errno.h>

 /* #include "tailor.h" */
--- a/archival/gzip.c
+++ b/archival/gzip.c
@ -1609,7 +1609,6 @@ ulg deflate()
 #include <ctype.h>
 #include <sys/types.h>
 #include <signal.h>
-#include <sys/stat.h>
 #include <errno.h>

 		/* configuration */
--- a/busybox.c
+++ b/busybox.c
@ -32,7 +32,7 @@ const struct BB_applet applets[] = {
 	{"chown", chmod_chown_chgrp_main, _BB_DIR_BIN, chown_usage},
 #endif
 #ifdef BB_CHROOT
-	{"chroot", chroot_main, _BB_DIR_SBIN, chroot_usage},
+	{"chroot", chroot_main, _BB_DIR_USR_SBIN, chroot_usage},
 #endif
 #ifdef BB_CLEAR
 	{"clear", clear_main, _BB_DIR_USR_BIN, clear_usage},
@ -65,7 +65,7 @@ const struct BB_applet applets[] = {
 	{"dmesg", dmesg_main, _BB_DIR_BIN, dmesg_usage},
 #endif
 #ifdef BB_DU
-	{"du", du_main, _BB_DIR_BIN, du_usage},
+	{"du", du_main, _BB_DIR_USR_BIN, du_usage},
 #endif
 #ifdef BB_DUMPKMAP
 	{"dumpkmap", dumpkmap_main, _BB_DIR_BIN, dumpkmap_usage},
@ -251,7 +251,7 @@ const struct BB_applet applets[] = {
 	{"sleep", sleep_main, _BB_DIR_BIN, sleep_usage},
 #endif
 #ifdef BB_SORT
-	{"sort", sort_main, _BB_DIR_BIN, sort_usage},
+	{"sort", sort_main, _BB_DIR_USR_BIN, sort_usage},
 #endif
 #ifdef BB_SYNC
 	{"sync", sync_main, _BB_DIR_BIN, sync_usage},
@ -278,7 +278,7 @@ const struct BB_applet applets[] = {
 	{"test", test_main, _BB_DIR_USR_BIN, test_usage},
 #endif
 #ifdef BB_TEE
-	{"tee", tee_main, _BB_DIR_BIN, tee_usage},
+	{"tee", tee_main, _BB_DIR_USR_BIN, tee_usage},
 #endif
 #ifdef BB_TOUCH
 	{"touch", touch_main, _BB_DIR_USR_BIN, touch_usage},
--- a/console-tools/dumpkmap.c
+++ b/console-tools/dumpkmap.c
@ -81,7 +81,7 @@ int dumpkmap_main(int argc, char **argv)
 					errorMsg("ioctl returned: %s, %s, %s, %xqq\n",strerror(errno),(char *)&ke.kb_index,(char *)&ke.kb_table,(int)&ke.kb_value);
 					}
 				else {
-					write(1,&ke.kb_value,2);	
+					write(1,(void*)&ke.kb_value,2);	
 					}	
 				
 			}
--- a/console-tools/loadacm.c
+++ b/console-tools/loadacm.c
@ -18,7 +18,6 @@
 #include <errno.h>
 #include <signal.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/kd.h>

--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@ -15,7 +15,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <dirent.h>
 #include <errno.h>
 #include <sys/ioctl.h>
--- a/coreutils/date.c
+++ b/coreutils/date.c
@ -31,6 +31,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <stdio.h>
+#include <getopt.h>


 /* This 'date' command supports only 2 time setting formats, 
--- a/coreutils/df.c
+++ b/coreutils/df.c
@ -25,7 +25,6 @@
 #include "internal.h"
 #include <stdio.h>
 #include <mntent.h>
-#include <sys/stat.h>
 #include <sys/vfs.h>

 extern const char mtab_file[];	/* Defined in utility.c */
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@ -50,7 +50,6 @@

 #include "internal.h"
 # include <sys/types.h>
-#include <sys/stat.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <dirent.h>
--- a/coreutils/mkfifo.c
+++ b/coreutils/mkfifo.c
@ -23,7 +23,6 @@
 #include "internal.h"
 #include <stdio.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <errno.h>

 extern int mkfifo_main(int argc, char **argv)
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@ -24,7 +24,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>

--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@ -51,7 +51,6 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@ -32,7 +32,6 @@

 */
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
--- a/coreutils/test.c
+++ b/coreutils/test.c
@ -33,7 +33,6 @@

 #include "internal.h"
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <errno.h>
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@ -25,7 +25,6 @@
 #include "internal.h"
 #include <stdio.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <utime.h>
 #include <errno.h>
--- a/date.c
+++ b/date.c
@ -31,6 +31,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <stdio.h>
+#include <getopt.h>


 /* This 'date' command supports only 2 time setting formats, 
--- a/df.c
+++ b/df.c
@ -25,7 +25,6 @@
 #include "internal.h"
 #include <stdio.h>
 #include <mntent.h>
-#include <sys/stat.h>
 #include <sys/vfs.h>

 extern const char mtab_file[];	/* Defined in utility.c */
--- a/dumpkmap.c
+++ b/dumpkmap.c
@ -81,7 +81,7 @@ int dumpkmap_main(int argc, char **argv)
 					errorMsg("ioctl returned: %s, %s, %s, %xqq\n",strerror(errno),(char *)&ke.kb_index,(char *)&ke.kb_table,(int)&ke.kb_value);
 					}
 				else {
-					write(1,&ke.kb_value,2);	
+					write(1,(void*)&ke.kb_value,2);	
 					}	
 				
 			}
--- a/dutmp.c
+++ b/dutmp.c
@ -14,7 +14,6 @@

 #include "internal.h"
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>

 #include <errno.h>
--- a/findutils/which.c
+++ b/findutils/which.c
@ -23,7 +23,6 @@

 #include "internal.h"
 #include <stdio.h>
-#include <sys/stat.h>
 #include <sys/param.h>

 extern int which_main(int argc, char **argv)
--- a/freeramdisk.c
+++ b/freeramdisk.c
@ -24,7 +24,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <errno.h>
--- a/fsck_minix.c
+++ b/fsck_minix.c
@ -96,7 +96,6 @@
 #include <stdlib.h>
 #include <termios.h>
 #include <mntent.h>
-#include <sys/stat.h>
 #include <sys/param.h>

 
--- a/gunzip.c
+++ b/gunzip.c
@ -94,7 +94,6 @@ static char *license_msg[] = {
 #include <ctype.h>
 #include <sys/types.h>
 #include <signal.h>
-#include <sys/stat.h>
 #include <errno.h>

 /* #include "tailor.h" */
--- a/gzip.c
+++ b/gzip.c
@ -1609,7 +1609,6 @@ ulg deflate()
 #include <ctype.h>
 #include <sys/types.h>
 #include <signal.h>
-#include <sys/stat.h>
 #include <errno.h>

 		/* configuration */
--- a/kill.c
+++ b/kill.c
@ -28,7 +28,6 @@
 #include <unistd.h>
 #include <signal.h>
 #include <ctype.h>
-#include <sys/stat.h>
 #include <unistd.h>

 #define KILL	0
--- a/loadacm.c
+++ b/loadacm.c
@ -18,7 +18,6 @@
 #include <errno.h>
 #include <signal.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/kd.h>

--- a/loadfont.c
+++ b/loadfont.c
@ -15,7 +15,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <dirent.h>
 #include <errno.h>
 #include <sys/ioctl.h>
--- a/logger.c
+++ b/logger.c
@ -25,7 +25,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <ctype.h>

--- a/ls.c
+++ b/ls.c
@ -50,7 +50,6 @@

 #include "internal.h"
 # include <sys/types.h>
-#include <sys/stat.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <dirent.h>
--- a/makedevs.c
+++ b/makedevs.c
@ -14,7 +14,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/stat.h>

 int makedevs_main(int argc, char **argv)
 {
--- a/miscutils/dutmp.c
+++ b/miscutils/dutmp.c
@ -14,7 +14,6 @@

 #include "internal.h"
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>

 #include <errno.h>
--- a/miscutils/makedevs.c
+++ b/miscutils/makedevs.c
@ -14,7 +14,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/stat.h>

 int makedevs_main(int argc, char **argv)
 {
--- a/mkfifo.c
+++ b/mkfifo.c
@ -23,7 +23,6 @@
 #include "internal.h"
 #include <stdio.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <errno.h>

 extern int mkfifo_main(int argc, char **argv)
--- a/mkfs_minix.c
+++ b/mkfs_minix.c
@ -72,7 +72,6 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <termios.h>
-#include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <mntent.h>
--- a/mknod.c
+++ b/mknod.c
@ -24,7 +24,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>

--- a/mkswap.c
+++ b/mkswap.c
@ -43,7 +43,6 @@
 #include <stdlib.h>
 #include <sys/ioctl.h>			/* for _IO */
 #include <sys/utsname.h>
-#include <sys/stat.h>
 #include <asm/page.h>			/* for PAGE_SIZE and PAGE_SHIFT */
 				/* we also get PAGE_SIZE via getpagesize() */

--- a/nfsmount.c
+++ b/nfsmount.c
@ -47,7 +47,6 @@
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/utsname.h>
-#include <sys/stat.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

--- a/printf.c
+++ b/printf.c
@ -51,7 +51,6 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
--- a/procps/kill.c
+++ b/procps/kill.c
@ -28,7 +28,6 @@
 #include <unistd.h>
 #include <signal.h>
 #include <ctype.h>
-#include <sys/stat.h>
 #include <unistd.h>

 #define KILL	0
--- a/sysklogd/logger.c
+++ b/sysklogd/logger.c
@ -25,7 +25,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <ctype.h>

--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@ -36,7 +36,6 @@
 #include <time.h>
 #include <unistd.h>
 #include <sys/socket.h>
-#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/un.h>
 #include <sys/param.h>
--- a/syslogd.c
+++ b/syslogd.c
@ -36,7 +36,6 @@
 #include <time.h>
 #include <unistd.h>
 #include <sys/socket.h>
-#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/un.h>
 #include <sys/param.h>
--- a/tail.c
+++ b/tail.c
@ -32,7 +32,6 @@

 */
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
--- a/test.c
+++ b/test.c
@ -33,7 +33,6 @@

 #include "internal.h"
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <errno.h>
--- a/touch.c
+++ b/touch.c
@ -25,7 +25,6 @@
 #include "internal.h"
 #include <stdio.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <utime.h>
 #include <errno.h>
--- a/util-linux/freeramdisk.c
+++ b/util-linux/freeramdisk.c
@ -24,7 +24,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <errno.h>
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@ -96,7 +96,6 @@
 #include <stdlib.h>
 #include <termios.h>
 #include <mntent.h>
-#include <sys/stat.h>
 #include <sys/param.h>

 
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@ -72,7 +72,6 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <termios.h>
-#include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <mntent.h>
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@ -43,7 +43,6 @@
 #include <stdlib.h>
 #include <sys/ioctl.h>			/* for _IO */
 #include <sys/utsname.h>
-#include <sys/stat.h>
 #include <asm/page.h>			/* for PAGE_SIZE and PAGE_SHIFT */
 				/* we also get PAGE_SIZE via getpagesize() */

--- a/util-linux/nfsmount.c
+++ b/util-linux/nfsmount.c
@ -47,7 +47,6 @@
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/utsname.h>
-#include <sys/stat.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

--- a/utility.c
+++ b/utility.c
@ -50,7 +50,6 @@
 #include <utime.h>
 #include <unistd.h>
 #include <ctype.h>
-#include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/utsname.h>		/* for uname(2) */

--- a/which.c
+++ b/which.c
@ -23,7 +23,6 @@

 #include "internal.h"
 #include <stdio.h>
-#include <sys/stat.h>
 #include <sys/param.h>

 extern int which_main(int argc, char **argv)