Patchs from Jeff Garzik <jgarzik@mandrakesoft.com> to cleanup

warnings with glibc 2.2 and use always use xfopen
 -Erik

cat.c

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

coreutils/cat.c

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

coreutils/df.c

@@ -24,6 +24,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <mntent.h>
 #include <sys/vfs.h>
 #include <getopt.h>

coreutils/du.c

@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>
+#include <string.h>
 #include <errno.h>
 #include "busybox.h"
 #define BB_DECLARE_EXTERN
@@ -196,7 +197,7 @@ int du_main(int argc, char **argv)
 	return status;
 }
 
-/* $Id: du.c,v 1.42 2001/03/07 17:42:07 markw Exp $ */
+/* $Id: du.c,v 1.43 2001/03/09 14:36:42 andersen Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"

coreutils/head.c

@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <getopt.h>
 #include <stdlib.h>
+#include <string.h>
 #include "busybox.h"
 
 int head(int len, FILE *fp)

coreutils/sort.c

@@ -22,6 +22,7 @@
  */
 
 #include <getopt.h>
+#include <string.h>
 #include <stdlib.h>
 #include "busybox.h"
 

coreutils/uname.c

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

coreutils/wc.c

@@ -22,6 +22,7 @@
 
 #include <stdio.h>
 #include <getopt.h>
+#include <string.h>
 #include <stdlib.h>
 #include "busybox.h"
 

dc.c

@@ -2,6 +2,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <math.h>
 #include "busybox.h"

df.c

@@ -24,6 +24,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <mntent.h>
 #include <sys/vfs.h>
 #include <getopt.h>

du.c

@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>
+#include <string.h>
 #include <errno.h>
 #include "busybox.h"
 #define BB_DECLARE_EXTERN
@@ -196,7 +197,7 @@ int du_main(int argc, char **argv)
 	return status;
 }
 
-/* $Id: du.c,v 1.42 2001/03/07 17:42:07 markw Exp $ */
+/* $Id: du.c,v 1.43 2001/03/09 14:36:42 andersen Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"

fbset.c

@@ -198,8 +198,7 @@ static int readmode(struct fb_var_screeninfo *base, const char *fn,
 	char buf[256];
 	char *p = buf;
 
-	if ((f = fopen(fn, "r")) == NULL)
+	f = xfopen(fn, "r");
-		perror_msg_and_die("readmode(fopen)");
 	while (!feof(f)) {
 		fgets(buf, sizeof(buf), f);
 		if ((p = strstr(buf, "mode ")) || (p = strstr(buf, "mode\t"))) {

head.c

@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <getopt.h>
 #include <stdlib.h>
+#include <string.h>
 #include "busybox.h"
 
 int head(int len, FILE *fp)

hostname.c

@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: hostname.c,v 1.24 2001/02/14 21:23:06 andersen Exp $
+ * $Id: hostname.c,v 1.25 2001/03/09 14:36:42 andersen Exp $
  * Mini hostname implementation for busybox
  *
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -30,6 +30,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 void do_sethostname(char *s, int isfile)
 {

lsmod.c

@@ -27,6 +27,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <stddef.h>
 #include <errno.h>
 #include <unistd.h>

miscutils/dc.c

@@ -2,6 +2,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <math.h>
 #include "busybox.h"

miscutils/mktemp.c

@@ -24,6 +24,7 @@
 
 #include <stdio.h>
 #include <errno.h>
+#include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include "busybox.h"

miscutils/mt.c

@@ -1,6 +1,7 @@
 /* vi: set sw=4 ts=4: */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/mtio.h>
 #include <sys/fcntl.h>
 #include "busybox.h"

mkfs_minix.c

@@ -683,10 +683,7 @@ char *filename;
 	FILE *listfile;
 	unsigned long blockno;
 
-	listfile = fopen(filename, "r");
+	listfile = xfopen(filename, "r");
-	if (listfile == (FILE *) NULL) {
-		error_msg_and_die("can't open file of bad blocks");
-	}
 	while (!feof(listfile)) {
 		fscanf(listfile, "%ld\n", &blockno);
 		mark_zone(blockno);

mktemp.c

@@ -24,6 +24,7 @@
 
 #include <stdio.h>
 #include <errno.h>
+#include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include "busybox.h"

modutils/lsmod.c

@@ -27,6 +27,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <stddef.h>
 #include <errno.h>
 #include <unistd.h>

mt.c

@@ -1,6 +1,7 @@
 /* vi: set sw=4 ts=4: */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/mtio.h>
 #include <sys/fcntl.h>
 #include "busybox.h"

nc.c

@@ -28,6 +28,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #include <sys/types.h>

networking/hostname.c

@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: hostname.c,v 1.24 2001/02/14 21:23:06 andersen Exp $
+ * $Id: hostname.c,v 1.25 2001/03/09 14:36:42 andersen Exp $
  * Mini hostname implementation for busybox
  *
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -30,6 +30,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 void do_sethostname(char *s, int isfile)
 {

networking/nc.c

@@ -28,6 +28,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #include <sys/types.h>

rdate.c

@@ -28,6 +28,8 @@
 #include <netdb.h>
 #include <stdio.h>
 #include <getopt.h>
+#include <string.h>
+#include <time.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include "busybox.h"

sort.c

@@ -22,6 +22,7 @@
  */
 
 #include <getopt.h>
+#include <string.h>
 #include <stdlib.h>
 #include "busybox.h"
 

swaponoff.c

@@ -26,6 +26,7 @@
 #include <mntent.h>
 #include <dirent.h>
 #include <errno.h>
+#include <string.h>
 #include <stdlib.h>
 #include <sys/mount.h>
 #include <sys/syscall.h>

uname.c

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

util-linux/fbset.c

@@ -198,8 +198,7 @@ static int readmode(struct fb_var_screeninfo *base, const char *fn,
 	char buf[256];
 	char *p = buf;
 
-	if ((f = fopen(fn, "r")) == NULL)
+	f = xfopen(fn, "r");
-		perror_msg_and_die("readmode(fopen)");
 	while (!feof(f)) {
 		fgets(buf, sizeof(buf), f);
 		if ((p = strstr(buf, "mode ")) || (p = strstr(buf, "mode\t"))) {

util-linux/mkfs_minix.c

@@ -683,10 +683,7 @@ char *filename;
 	FILE *listfile;
 	unsigned long blockno;
 
-	listfile = fopen(filename, "r");
+	listfile = xfopen(filename, "r");
-	if (listfile == (FILE *) NULL) {
-		error_msg_and_die("can't open file of bad blocks");
-	}
 	while (!feof(listfile)) {
 		fscanf(listfile, "%ld\n", &blockno);
 		mark_zone(blockno);

util-linux/rdate.c

@@ -28,6 +28,8 @@
 #include <netdb.h>
 #include <stdio.h>
 #include <getopt.h>
+#include <string.h>
+#include <time.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include "busybox.h"

util-linux/swaponoff.c

@@ -26,6 +26,7 @@
 #include <mntent.h>
 #include <dirent.h>
 #include <errno.h>
+#include <string.h>
 #include <stdlib.h>
 #include <sys/mount.h>
 #include <sys/syscall.h>

wc.c

@@ -22,6 +22,7 @@
 
 #include <stdio.h>
 #include <getopt.h>
+#include <string.h>
 #include <stdlib.h>
 #include "busybox.h"