diff -ruP -X../diff.xcl ../orig/uClinux-dist/lib/Makefile ./lib/Makefile
--- ../orig/uClinux-dist/lib/Makefile	Mon Nov 12 15:06:48 2001
+++ ./lib/Makefile	Thu Jan 17 14:52:25 2002
@@ -49,7 +49,7 @@
 
 romfs:
 ifeq ($(LIBCDIR),glibc/build)
-	make -C $(LIBCDIR) romfs || exit $?
+	make -C $(LIBCDIR) romfs || exit $$?
 	-strip $(ROMFSDIR)/lib/*
 endif
 
diff -ruP -X../diff.xcl ../orig/uClinux-dist/lib/libg/gtermcap/termcap.c ./lib/libg/gtermcap/termcap.c
--- ../orig/uClinux-dist/lib/libg/gtermcap/termcap.c	Mon Nov 12 15:06:54 2001
+++ ./lib/libg/gtermcap/termcap.c	Mon Jan 28 15:42:53 2002
@@ -127,11 +132,12 @@
 find_capability (bp, cap)
      register char *bp, *cap;
 {
-  for (; *bp; bp++)
-    if (bp[0] == ':'
-	&& bp[1] == cap[0]
-	&& bp[2] == cap[1])
-      return &bp[4];
+  if (bp)
+    for (; *bp; bp++)
+      if (bp[0] == ':'
+	  && bp[1] == cap[0]
+	  && bp[2] == cap[1])
+	return &bp[4];
   return NULL;
 }
 
diff -ruP -X../diff.xcl ../orig/uClinux-dist/user/levee/levee.h ./user/levee/levee.h
--- ../orig/uClinux-dist/user/levee/levee.h	Mon Nov 12 15:08:32 2001
+++ ./user/levee/levee.h	Thu Jan 17 15:10:56 2002
@@ -33,7 +33,6 @@
 #define LEVEE_D
 #define	TOUPPER_FTN	/* defined if the libraries support toupper as */
 			/* a function call */
-#define realloc(X,Y) ({char *__p; __p = malloc(Y); memcpy(__p,(X),(Y)); __p;})
 
 #ifndef TRUE
 #define	TRUE	(1)	/* Nobody defines TRUE & FALSE, so I will do */
diff -ruP -X../diff.xcl ../orig/uClinux-dist/user/sysutils/df.c ./user/sysutils/df.c
--- ../orig/uClinux-dist/user/sysutils/df.c	Mon Nov 12 15:10:05 2001
+++ ./user/sysutils/df.c	Fri Jan 18 14:11:26 2002
@@ -11,6 +11,7 @@
  */
 #include <linux/autoconf.h>
 
+#include <stdio.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/vfs.h>
diff -ruP -X../diff.xcl ../orig/uClinux-dist/user/sysutils/free.c ./user/sysutils/free.c
--- ../orig/uClinux-dist/user/sysutils/free.c	Mon Nov 12 15:10:05 2001
+++ ./user/sysutils/free.c	Fri Jan 18 14:12:51 2002
@@ -12,6 +12,7 @@
 
 #include <linux/autoconf.h>
 
+#include <stdio.h>
 #include <fcntl.h>
 #include <sys/types.h>
 
diff -ruP -X../diff.xcl ../orig/uClinux-dist/user/sysutils/ps.c ./user/sysutils/ps.c
--- ../orig/uClinux-dist/user/sysutils/ps.c	Mon Nov 12 15:10:05 2001
+++ ./user/sysutils/ps.c	Fri Jan 18 14:11:37 2002
@@ -12,6 +12,7 @@
 
 #include <linux/autoconf.h>
 
+#include <stdio.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sys/types.h>
diff -ruP -X../diff.xcl ../orig/uClinux-dist/user/tinylogin/passwd.c ./user/tinylogin/passwd.c
--- ../orig/uClinux-dist/user/tinylogin/passwd.c	Mon Nov 12 15:10:13 2001
+++ ./user/tinylogin/passwd.c	Thu Jan 17 16:20:08 2002
@@ -168,7 +168,6 @@
 	char buffer[80];
 	char username[32];
 	char *pw_rest;
-	int has_shadow = 0;
 	int mask;
 	int continued;
 	FILE *fp;
@@ -176,14 +175,15 @@
 	struct stat sb;
 	struct flock lock;
 
+#ifdef SHADOW_FILE
 	if (access(SHADOW_FILE, F_OK) == 0) {
-		has_shadow = 1;
-	}
-	if (has_shadow) {
 		snprintf(filename, sizeof filename, "%s", SHADOW_FILE);
 	} else {
 		snprintf(filename, sizeof filename, "%s", PASSWD_FILE);
 	}
+#else /* !SHADOW_FILE */
+	snprintf(filename, sizeof filename, "%s", PASSWD_FILE);
+#endif /* SHADOW_FILE */
 
 	if (((fp = fopen(filename, "r+")) == 0) || (fstat(fileno(fp), &sb))) {
 		/* return 0; */