diff -r -c3 ash-linux-0.2.bak/Makefile ash-linux-0.2/Makefile *** ash-linux-0.2.bak/Makefile Sun Oct 6 00:40:06 2002 --- ash-linux-0.2/Makefile Sun Oct 6 00:38:11 2002 *************** *** 1,5 **** --- 1,7 ---- # Makefile,v 1.7 1993/08/09 04:58:18 mycroft Exp + prefix = /gnu/usr + PROG= sh SRCS= builtins.c cd.c dirent.c echo.c error.c eval.c exec.c expand.c \ input.c jobs.c mail.c main.c memalloc.c miscbltin.c \ *************** *** 16,23 **** #CFLAGS = -O2 -pipe -DSHELL -I/usr/include/bsd -I. -D__BIT_TYPES_DEFINED__ #LDFLAGS = -s -lbsd ! CFLAGS = -O2 -fsigned-char -pipe -DSHELL -I. -D__BIT_TYPES_DEFINED__ ! LDFLAGS = -s CLEANFILES =\ builtins.c builtins.h init.c mkinit mknodes mksyntax \ --- 18,25 ---- #CFLAGS = -O2 -pipe -DSHELL -I/usr/include/bsd -I. -D__BIT_TYPES_DEFINED__ #LDFLAGS = -s -lbsd ! CFLAGS = -O2 -fsigned-char -pipe -DSHELL -I. -D__BIT_TYPES_DEFINED__ -g ! LDFLAGS = CLEANFILES =\ builtins.c builtins.h init.c mkinit mknodes mksyntax \ *************** *** 28,36 **** $(CC) -static -o $(PROG).static $(OBJS) $(LDFLAGS) install: all ! install sh /bin/ash ! install sh.static /bin/ash.static ! install -m 644 sh.1 /usr/share/man/man1/ash.1 parser.o: token.def token.def: mktokens --- 30,38 ---- $(CC) -static -o $(PROG).static $(OBJS) $(LDFLAGS) install: all ! install -c sh $(prefix)/bin/ash ! install -c sh.static $(prefix)/bin/ash.static ! install -c -m 644 sh.1 $(prefix)/share/man/man1/ash.1 parser.o: token.def token.def: mktokens diff -r -c3 ash-linux-0.2.bak/error.h ash-linux-0.2/error.h *** ash-linux-0.2.bak/error.h Mon Oct 4 19:48:13 1993 --- ash-linux-0.2/error.h Sun Oct 6 00:32:26 2002 *************** *** 101,116 **** void error(); char *errmsg(); #endif - - - /* - * BSD setjmp saves the signal mask, which violates ANSI C and takes time, - * so we use _setjmp instead. - */ - - #ifdef BSD - #ifndef linux - #define setjmp(jmploc) _setjmp(jmploc) - #define longjmp(jmploc, val) _longjmp(jmploc, val) - #endif - #endif --- 101,103 ---- diff -r -c3 ash-linux-0.2.bak/miscbltin.c ash-linux-0.2/miscbltin.c *** ash-linux-0.2.bak/miscbltin.c Mon Oct 4 19:48:14 1993 --- ash-linux-0.2/miscbltin.c Sun Oct 6 00:33:59 2002 *************** *** 207,222 **** } while (*++ap != '\0'); umask(mask); } else { ! #ifndef __linux__ ! void *set; ! if ((set = setmode (ap)) == 0) ! #endif ! error("Illegal number: %s", ap); ! ! #ifndef __linux__ ! mask = getmode (set, ~mask & 0777); ! umask(~mask & 0777); ! #endif } } return 0; --- 207,213 ---- } while (*++ap != '\0'); umask(mask); } else { ! error("Illegal number: %s", ap); } } return 0;