diff -ruP -X../diff.xcl ../orig/uClinux-dist/config/config.in ./config/config.in --- ../orig/uClinux-dist/config/config.in Mon Nov 12 15:11:41 2001 +++ ./config/config.in Mon Jan 28 17:57:47 2002 @@ -850,6 +850,9 @@ bool 'advent4' CONFIG_USER_GAMES_ADVENT4 bool 'dungeon' CONFIG_USER_GAMES_DUNGEON +if [ "$CONFIG_USER_GAMES_DUNGEON" = "y" ]; then + define_bool CONFIG_LIB_LIBG y +fi bool 'mame' CONFIG_USER_GAMES_XMAME endmenu 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 @@ -1,5 +1,5 @@ /* Work-alike for termcap, plus extra features. - Copyright (C) 1985, 1986, 1993 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,6 +25,7 @@ #define STDC_HEADERS #define HAVE_UNISTD_H #define HAVE_SYS_IOCTL_H +#define HAVE_TERMIOS_H #else #if defined(HAVE_STRING_H) || defined(STDC_HEADERS) #define bcopy(s, d, n) memcpy ((d), (s), (n)) @@ -52,6 +53,10 @@ #include #endif +#ifdef HAVE_TERMIOS_H +#include +#endif + #endif /* not HAVE_CONFIG_H */ #ifndef NULL diff -ruP -X../diff.xcl ../orig/uClinux-dist/lib/libg/gtermcap/tparam.c ./lib/libg/gtermcap/tparam.c --- ../orig/uClinux-dist/lib/libg/gtermcap/tparam.c Mon Nov 12 15:06:54 2001 +++ ./lib/libg/gtermcap/tparam.c Wed Jan 16 18:12:09 2002 @@ -24,9 +24,6 @@ #undef STDC_HEADERS #define STDC_HEADERS #define HAVE_UNISTD_H -#if defined(HAVE_STRING_H) || defined(STDC_HEADERS) -#define bcopy(s, d, n) memcpy ((d), (s), (n)) -#endif #endif #ifdef STDC_HEADERS diff -ruP -X../diff.xcl ../orig/uClinux-dist/user/busybox/init.c ./user/busybox/init.c --- ../orig/uClinux-dist/user/busybox/init.c Mon Nov 12 15:07:54 2001 +++ ./user/busybox/init.c Thu Jan 17 11:29:28 2002 @@ -184,7 +184,10 @@ static char *thirdConsole = VC_3; static char *fourthConsole = VC_4; static char *log = VC_5; +#else +static char *log = 0; /* Always use the console. */ #endif + static int kernelVersion = 0; static char termType[32] = "TERM=linux"; static char console[32] = _PATH_CONSOLE; diff -ruP -X../diff.xcl ../orig/uClinux-dist/user/dhrystone/Makefile ./user/dhrystone/Makefile --- ../orig/uClinux-dist/user/dhrystone/Makefile Mon Nov 12 15:08:03 2001 +++ ./user/dhrystone/Makefile Wed Jan 23 17:31:57 2002 @@ -2,7 +2,7 @@ EXEC = dhrystone OBJS = dhry_1.o dhry_2.o -CFLAGS += -DNO_PROTOTYPES=1 +CFLAGS += -DNO_PROTOTYPES=1 -DHZ=100 all: $(EXEC) diff -ruP -X../diff.xcl ../orig/uClinux-dist/user/fileutils/cat.c ./user/fileutils/cat.c --- ../orig/uClinux-dist/user/fileutils/cat.c Mon Nov 12 15:08:17 2001 +++ ./user/fileutils/cat.c Fri Jan 18 14:06:05 2002 @@ -44,7 +44,7 @@ write(STDERR_FILENO, colon, 2); write(STDERR_FILENO, argv[i], strlen(argv[i])); write(STDERR_FILENO, colon, 2); - write(STDERR_FILENO, sys_errlist[errno], strlen(sys_errlist[errno])); + write(STDERR_FILENO, strerror (errno), strlen (strerror (errno))); write(STDERR_FILENO, &nl, 1); } else { dumpfile(fd); diff -ruP -X../diff.xcl ../orig/uClinux-dist/user/games/dungeon/Makefile ./user/games/dungeon/Makefile --- ../orig/uClinux-dist/user/games/dungeon/Makefile Mon Nov 12 15:08:17 2001 +++ ./user/games/dungeon/Makefile Fri Jan 18 14:24:44 2002 @@ -19,6 +19,8 @@ #TERMFLAG = # LIBS = -lcurses # LIBS = /usr/lib/termcap.o +LIBS = $(LIBTERMCAP) +TERMFLAG = # more option 2: use the terminfo routines. On some systems the LIBS # variable needs to be -lcursesX, but probably all such systems support @@ -27,8 +29,8 @@ # TERMFLAG = -DMORE_TERMINFO # more option 3: assume all terminals have 24 rows -LIBS = -TERMFLAG = -DMORE_24 +# LIBS = +# TERMFLAG = -DMORE_24 # more option 4: don't use the more facility at all # LIBS = @@ -63,7 +65,7 @@ nrooms.o objcts.o rooms.o sobjs.o supp.o sverbs.o verbs.o villns.o dungeon: $(OBJS) dtextc.dat - $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(LDLIBS) romfs: $(ROMFSINST) /bin/dungeon diff -ruP -X../diff.xcl ../orig/uClinux-dist/user/mini_httpd/Makefile ./user/mini_httpd/Makefile --- ../orig/uClinux-dist/user/mini_httpd/Makefile Mon Nov 12 15:08:46 2001 +++ ./user/mini_httpd/Makefile Thu Jan 17 15:21:46 2002 @@ -12,7 +12,8 @@ #LDFLAGS += -g CFLAGS += -MD -LDFLAGS += $(LIBCRYPT) + +EXTRALIBS += -L$(ROOTDIR)/lib/$(LIBCDIR)/lib $(LIBCRYPT) all: mime_types.h mini_httpd htpasswd diff -ruP -X../diff.xcl ../orig/uClinux-dist/user/mini_httpd/mini_httpd.c ./user/mini_httpd/mini_httpd.c --- ../orig/uClinux-dist/user/mini_httpd/mini_httpd.c Mon Nov 12 15:08:47 2001 +++ ./user/mini_httpd/mini_httpd.c Thu Jan 17 15:17:56 2002 @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include diff -ruP -X../diff.xcl ../orig/uClinux-dist/user/mini_httpd/port.h ./user/mini_httpd/port.h --- ../orig/uClinux-dist/user/mini_httpd/port.h Mon Nov 12 15:08:47 2001 +++ ./user/mini_httpd/port.h Thu Jan 17 15:27:56 2002 @@ -28,7 +28,9 @@ #endif #ifdef Linux -# define HAVE_DAEMON +# ifndef __uClinux__ +# define HAVE_DAEMON +# endif # define HAVE_SETSID # define HAVE_WAITPID #endif diff -ruP -X../diff.xcl ../orig/uClinux-dist/user/sash/sash.c ./user/sash/sash.c --- ../orig/uClinux-dist/user/sash/sash.c Mon Nov 12 15:09:48 2001 +++ ./user/sash/sash.c Thu Jan 17 15:32:46 2002 @@ -26,9 +26,9 @@ #include #include -#ifndef EMBED +/* #ifndef EMBED */ #define __signal(x,y,z) do {} while (0) -#endif +/* #endif */ static char version[] = "1.1.1"; diff -ruP -X../diff.xcl ../orig/uClinux-dist/user/thttpd/Makefile ./user/thttpd/Makefile --- ../orig/uClinux-dist/user/thttpd/Makefile Mon Nov 12 15:10:13 2001 +++ ./user/thttpd/Makefile Thu Jan 17 16:13:13 2002 @@ -1,7 +1,7 @@ EXEC = thttpd OBJS = thttpd.o libhttpd.o mmc.o timers.o match.o \ - tdate_parse.o syslog.o writev.o + tdate_parse.o syslog.o CFLAGS += -DHAVE_FCNTL_H=1 -DHAVE_MEMORY_H=1 \ -DHAVE_PATHS_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_DIRENT_H=1 \