sverre@lars.Seri.GOV (Sverre Froyen) (06/18/91)
Here are the promised diffs for bash-1.08 with patch 1 applied.
You will also need the separately posted patches to readline.
It may also be that you need gnu make file the makefiles to
work properly (I gave up on Minix make a long time ago).
If there is interest I can also mail out a bash binary or,
if an archive site volunteers, put it up for ftp.
--
Sverre Froyen
sverre@seri.gov, sunpeaks!seri!sverre
#! /bin/sh
# This is a shell archive. Remove anything before this line, then unpack
# it by saving it into a file and typing "sh file". To overwrite existing
# files, type "sh file -c". You can also feed this as standard input via
# unshar, or by typing "sh <file", e.g.. If this archive is complete, you
# will see the following message at the end:
# "End of shell archive."
# Contents: bash.diff
# Wrapped by sverre@lars on Mon Jun 17 22:30:03 1991
PATH=/bin:/usr/bin:/usr/ucb ; export PATH
if test -f bash.diff -a "${1}" != "-c" ; then
echo shar: Will not over-write existing file \"bash.diff\"
else
echo shar: Extracting \"bash.diff\" \(16091 characters\)
sed "s/^X//" >bash.diff <<'END_OF_bash.diff'
X*** 1.1 1991/05/27 20:06:53
X--- Makefile 1991/05/27 20:18:10
X***************
X*** 10,22 ****
X #
X # If you haven't read README, now might be a good time.
X
X! DESTDIR = /usr/gnu/bin
X MAKE = make
X! SHELL= /bin/sh
X # AWK = gawk
X! AWK = awk
X
X! CPP = /lib/cpp `./cppmagic.sh` -P
X #CPP = $(CC) -E
X
X CPPFLAGS = $(SYSTEM) $(CPP_DEFINES) -DM_DESTDIR=$(DESTDIR)
X--- 10,22 ----
X #
X # If you haven't read README, now might be a good time.
X
X! DESTDIR = /usr/bin
X MAKE = make
X! SHELL= /usr/bin/bash
X # AWK = gawk
X! # AWK = awk
X
X! CPP = /usr/lib/gcc-cpp -traditional -P
X #CPP = $(CC) -E
X
X CPPFLAGS = $(SYSTEM) $(CPP_DEFINES) -DM_DESTDIR=$(DESTDIR)
X***************
X*** 28,36 ****
X # much trouble with this, just forget it. It is for making
X # bash-Makefile pretty and readable; something that isn't strictly
X # necessary.
X! # SQUASH_BLANKS = cat -s
X #
X! SQUASH_BLANKS = $(AWK) -f ./cat-s
X
X all: bash-Makefile
X $(MAKE) $(MFLAGS) $(MAKEARGS) -f bash-Makefile
X--- 28,36 ----
X # much trouble with this, just forget it. It is for making
X # bash-Makefile pretty and readable; something that isn't strictly
X # necessary.
X! SQUASH_BLANKS = cat -s
X #
X! # SQUASH_BLANKS = $(AWK) -f ./cat-s
X
X all: bash-Makefile
X $(MAKE) $(MFLAGS) $(MAKEARGS) -f bash-Makefile
X***************
X*** 37,43 ****
X
X bash-Makefile: cpp-Makefile Makefile machines.h sysdefs.h config.h
X cp cpp-Makefile tmp-Makefile.c
X! @/bin/sh -c 'echo $(CPP) $(CPPFLAGS) $(CPP_ARGS) tmp-Makefile.c \| $(SQUASH_BLANKS) \> bash-Makefile'
X @/bin/sh -c '$(CPP) $(CPPFLAGS) $(CPP_ARGS) tmp-Makefile.c | $(SQUASH_BLANKS) >bash-Makefile'
X rm -f tmp-Makefile.c
X
X--- 37,43 ----
X
X bash-Makefile: cpp-Makefile Makefile machines.h sysdefs.h config.h
X cp cpp-Makefile tmp-Makefile.c
X! # @/bin/sh -c 'echo $(CPP) $(CPPFLAGS) $(CPP_ARGS) tmp-Makefile.c \| $(SQUASH_BLANKS) \> bash-Makefile'
X @/bin/sh -c '$(CPP) $(CPPFLAGS) $(CPP_ARGS) tmp-Makefile.c | $(SQUASH_BLANKS) >bash-Makefile'
X rm -f tmp-Makefile.c
X
X*** 1.1 1991/05/27 20:24:17
X--- config.h 1991/05/29 19:32:05
X***************
X*** 59,65 ****
X--- 59,72 ----
X #endif
X
X #if defined (HAVE_UNISTD_H) && !defined (BUILDING_MAKEFILE)
X+ #if defined (MINIX)
X+ #include <sys/types.h>
X+ #endif
X #include <unistd.h>
X+ #endif
X+
X+ #if defined (MINIX)
X+ #undef _POSIX_VERSION
X #endif
X
X /* Define JOB_CONTROL if your operating system supports
X*** 1.1 1991/05/27 20:19:18
X--- cpp-Makefile 1991/06/17 20:17:08
X***************
X*** 188,194 ****
X
X SYSTEM_FLAGS = $(LINEBUF) $(VPRINTF) $(UNISTD) $(GROUPS) $(RESOURCE) \
X $(SIGHANDLER) $(SYSDEP) $(WAITH) $(GETWD) $(DUP2) -D$(MACHINE) -D$(OS)
X! DEBUG_FLAGS = $(PROFILE_FLAGS) -g
X LDFLAGS = $(SYSDEP_LD) $(DEBUG_FLAGS)
X CFLAGS = $(DEBUG_FLAGS) $(SYSTEM_FLAGS) -DSHELL $(ALLOCA_CFLAGS)
X CPPFLAGS= -I$(LIBSRC)
X--- 188,194 ----
X
X SYSTEM_FLAGS = $(LINEBUF) $(VPRINTF) $(UNISTD) $(GROUPS) $(RESOURCE) \
X $(SIGHANDLER) $(SYSDEP) $(WAITH) $(GETWD) $(DUP2) -D$(MACHINE) -D$(OS)
X! DEBUG_FLAGS = $(PROFILE_FLAGS)
X LDFLAGS = $(SYSDEP_LD) $(DEBUG_FLAGS)
X CFLAGS = $(DEBUG_FLAGS) $(SYSTEM_FLAGS) -DSHELL $(ALLOCA_CFLAGS)
X CPPFLAGS= -I$(LIBSRC)
X***************
X*** 350,356 ****
X
X /**/# Directory list for -L so that the loader can find -lreadline.
X #if defined (HAVE_READLINE_SOURCE)
X! READLINE_LDFLAGS = -L$(RLIBSRC) $(TERMCAP_LDFLAGS)
X #else
X READLINE_LDFLAGS = -L/usr/gnu/lib -L/usr/local/lib $(TERMCAP_LDFLAGS)
X #endif /* HAVE_READLINE_SOURCE */
X--- 350,357 ----
X
X /**/# Directory list for -L so that the loader can find -lreadline.
X #if defined (HAVE_READLINE_SOURCE)
X! #READLINE_LDFLAGS = -L$(RLIBSRC) $(TERMCAP_LDFLAGS)
X! READLINE_LDFLAGS =
X #else
X READLINE_LDFLAGS = -L/usr/gnu/lib -L/usr/local/lib $(TERMCAP_LDFLAGS)
X #endif /* HAVE_READLINE_SOURCE */
X***************
X*** 366,372 ****
X #endif /* REQUIRED_LIBRARIES */
X
X /**/# The order is important. Most dependent first.
X! LIBRARIES = $(READLINE_LIB) $(TERMCAP_LIB) $(LOCAL_LIBS)
X
X #if defined (HAVE_TERMCAP_SOURCE)
X TERMCAP_DEP = TERMCAP_LIBRARY
X--- 367,374 ----
X #endif /* REQUIRED_LIBRARIES */
X
X /**/# The order is important. Most dependent first.
X! #LIBRARIES = $(READLINE_LIB) $(TERMCAP_LIB) $(LOCAL_LIBS)
X! LIBRARIES = readline/libreadline.a $(LOCAL_LIBS)
X
X #if defined (HAVE_TERMCAP_SOURCE)
X TERMCAP_DEP = TERMCAP_LIBRARY
X***************
X*** 392,398 ****
X #endif
X
X CSOURCES = shell.c parse.y general.c make_cmd.c print_cmd.c y.tab.c \
X! dispose_cmd.c execute_cmd.c variables.c builtins.c\
X fc.c expr.c copy_cmd.c flags.c subst.c glob.c hash.c mailcheck.c\
X test.c trap.c jobs.c nojobs.c $(ALLOC_FILES) braces.c\
X unwind_prot.c siglist.c ulimit.c version.c $(RL_SUPPORT_SRC)
X--- 394,400 ----
X #endif
X
X CSOURCES = shell.c parse.y general.c make_cmd.c print_cmd.c y.tab.c \
X! dispose_cmd.c execut_cmd.c variables.c builtins.c\
X fc.c expr.c copy_cmd.c flags.c subst.c glob.c hash.c mailcheck.c\
X test.c trap.c jobs.c nojobs.c $(ALLOC_FILES) braces.c\
X unwind_prot.c siglist.c ulimit.c version.c $(RL_SUPPORT_SRC)
X***************
X*** 404,410 ****
X SOURCES = $(CSOURCES) $(HSOURCES)
X
X OBJECTS = shell.o y.tab.o general.o make_cmd.o print_cmd.o\
X! dispose_cmd.o execute_cmd.o variables.o builtins.o copy_cmd.o\
X fc.o expr.o flags.o jobs.o subst.o glob.o hash.o mailcheck.o test.o\
X trap.o alias.o $(MALLOC) $(ALLOCA) braces.o unwind_prot.o\
X $(SIGLIST) ulimit.o version.o $(RL_SUPPORT_OBJ)
X--- 406,412 ----
X SOURCES = $(CSOURCES) $(HSOURCES)
X
X OBJECTS = shell.o y.tab.o general.o make_cmd.o print_cmd.o\
X! dispose_cmd.o execut_cmd.o variables.o builtins.o copy_cmd.o\
X fc.o expr.o flags.o jobs.o subst.o glob.o hash.o mailcheck.o test.o\
X trap.o alias.o $(MALLOC) $(ALLOCA) braces.o unwind_prot.o\
X $(SIGLIST) ulimit.o version.o $(RL_SUPPORT_OBJ)
X***************
X*** 539,545 ****
X builtins.o: shell.h hash.h jobs.h builtins.h trap.h flags.h
X copy_cmd.o: shell.h hash.h
X dispose_cmd.o: shell.h
X! execute_cmd.o: shell.h y.tab.h posixstat.h builtins.h flags.h jobs.h
X expr.o: shell.h hash.h
X fc.o: shell.h hash.h builtins.h
X flags.o: flags.h config.h general.h quit.h
X--- 541,547 ----
X builtins.o: shell.h hash.h jobs.h builtins.h trap.h flags.h
X copy_cmd.o: shell.h hash.h
X dispose_cmd.o: shell.h
X! execut_cmd.o: shell.h y.tab.h posixstat.h builtins.h flags.h jobs.h
X expr.o: shell.h hash.h
X fc.o: shell.h hash.h builtins.h
X flags.o: flags.h config.h general.h quit.h
X***************
X*** 616,622 ****
X @cp $(PROGRAM).tar.Z $(PROGRAM)-`cat .distribution`.tar.Z
X
X newversion.aux: newversion.c
X! $(CC) $(DEBUG_FLAGS) -o newversion.aux newversion.c -lm
X
X newversion: newversion.aux
X rm -f .build
X--- 618,624 ----
X @cp $(PROGRAM).tar.Z $(PROGRAM)-`cat .distribution`.tar.Z
X
X newversion.aux: newversion.c
X! $(CC) $(DEBUG_FLAGS) -o newversion.aux newversion.c -lm -lfp
X
X newversion: newversion.aux
X rm -f .build
X*** 1.1 1991/06/17 19:44:49
X--- execut_cmd.c 1991/06/17 19:51:08
X***************
X*** 1732,1738 ****
X--- 1732,1742 ----
X {
X if (remembering)
X /* Only setup to undo it if the thing to undo is active. */
X+ #if defined (MINIX)
X+ if (fd != redirector)
X+ #else
X if ((fd != redirector) && (fcntl (redirector, F_GETFD, 0) != -1))
X+ #endif
X add_undo_redirect (redirector);
X else
X add_undo_close_redirect (redirector);
X***************
X*** 1832,1839 ****
X--- 1836,1847 ----
X {
X if (remembering)
X /* Only setup to undo it if the thing to undo is active. */
X+ #if defined (MINIX)
X+ if (fd != redirector)
X+ #else
X if ((fd != redirector) &&
X (fcntl (redirector, F_GETFD, 0) != -1))
X+ #endif
X add_undo_redirect (redirector);
X else
X add_undo_close_redirect (redirector);
X***************
X*** 1857,1864 ****
X--- 1865,1876 ----
X {
X if (remembering)
X /* Only setup to undo it if the thing to undo is active. */
X+ #if defined (MINIX)
X+ if ((int)redirectee != redirector)
X+ #else
X if (((int)redirectee != redirector) &&
X (fcntl (redirector, F_GETFD, 0) != -1))
X+ #endif
X add_undo_redirect (redirector);
X else
X add_undo_close_redirect (redirector);
X***************
X*** 1875,1883 ****
X--- 1887,1897 ----
X unless closed by something like `exec 2<&-'. */
X /* if ((already_set || set_unconditionally) && (ok_to_set))
X set_it () */
X+ #if !defined (MINIX)
X if (((fcntl ((int)redirectee, F_GETFD, 0) == 1) || set_clexec) &&
X (redirector > 2))
X SET_CLOSE_ON_EXEC (redirector);
X+ #endif
X }
X break;
X
X***************
X*** 1901,1907 ****
X--- 1915,1925 ----
X int fd;
X {
X int new_fd = fcntl (fd, F_DUPFD, SHELL_FD_BASE);
X+ #if defined (MINIX)
X+ int clexec_flag = 0;
X+ #else
X int clexec_flag = fcntl (fd, F_GETFD, 0);
X+ #endif
X REDIRECT *new_redirect, *closer;
X
X if (new_fd < 0)
X*** 1.1 1991/05/29 19:21:12
X--- general.c 1991/05/29 20:16:51
X***************
X*** 680,686 ****
X int
X getdtablesize ()
X {
X! #if defined (_POSIX_VERSION)
X return (sysconf(_SC_OPEN_MAX)); /* Posix systems use sysconf */
X #else
X # if defined (USGr3)
X--- 680,686 ----
X int
X getdtablesize ()
X {
X! #if defined (_POSIX_VERSION) || defined (MINIX)
X return (sysconf(_SC_OPEN_MAX)); /* Posix systems use sysconf */
X #else
X # if defined (USGr3)
X***************
X*** 732,738 ****
X--- 732,742 ----
X
X --namelen;
X
X+ #if defined (MINIX)
X+ strncpy (uts.nodename, HOSTNAME, _UTSLEN);
X+ #else
X uname (&uts);
X+ #endif
X i = strlen (uts.nodename) + 1;
X strncpy (name, uts.nodename, i < namelen ? i : namelen);
X name[namelen] = '\0';
X***************
X*** 740,745 ****
X--- 744,757 ----
X }
X #endif /* !HPUX */
X #endif /* USG && !sgi */
X+
X+ #ifdef MINIX
X+ ulimit (i1, i2, i3)
X+ int i1, i2, i3;
X+ {
X+ return 0;
X+ }
X+ #endif
X
X #if defined (USG) || defined (_POSIX_VERSION)
X int
X*** 1.1 1991/05/28 17:55:44
X--- glob.c 1991/05/28 17:58:00
X***************
X*** 57,63 ****
X #include <string.h>
X #else
X #if defined (USG)
X! #if !defined (isc386)
X # include <memory.h>
X #endif
X #include <string.h>
X--- 57,63 ----
X #include <string.h>
X #else
X #if defined (USG)
X! #if !defined (isc386) && !defined (MINIX)
X # include <memory.h>
X #endif
X #include <string.h>
X*** 1.1 1991/05/28 19:27:29
X--- hash.c 1991/05/28 19:27:57
X***************
X*** 24,30 ****
X #include "shell.h"
X #include "hash.h"
X
X! HASH_TABLE *hashed_filenames;
X
X #define FILENAME_HASH_BUCKETS 107
X
X--- 24,30 ----
X #include "shell.h"
X #include "hash.h"
X
X! extern HASH_TABLE *hashed_filenames;
X
X #define FILENAME_HASH_BUCKETS 107
X
X*** 1.1 1991/05/29 19:34:11
X--- jobs.h 1991/05/29 19:40:48
X***************
X*** 20,26 ****
X
X #include "endian.h"
X
X! #if !defined (_POSIX_VERSION)
X #if defined (LITTLE_ENDIAN)
X union wait
X {
X--- 20,26 ----
X
X #include "endian.h"
X
X! #if !defined (_POSIX_VERSION) && !defined (MINIX)
X #if defined (LITTLE_ENDIAN)
X union wait
X {
X***************
X*** 93,99 ****
X #endif /* _POSIX_VERSION */
X #endif /* !HAVE_WAIT_H */
X
X! #if !defined (_POSIX_VERSION)
X #define pid_t int
X typedef union wait WAIT;
X #else
X--- 93,99 ----
X #endif /* _POSIX_VERSION */
X #endif /* !HAVE_WAIT_H */
X
X! #if !defined (_POSIX_VERSION) && !defined (MINIX)
X #define pid_t int
X typedef union wait WAIT;
X #else
X***************
X*** 102,108 ****
X
X /* How to get the status of a job. For Posix, this is just an int, but for
X other systems we have to crack the union wait. */
X! #if defined (_POSIX_VERSION)
X #define WSTATUS(t) (t)
X #else
X #define WSTATUS(t) (t.w_status)
X--- 102,108 ----
X
X /* How to get the status of a job. For Posix, this is just an int, but for
X other systems we have to crack the union wait. */
X! #if defined (_POSIX_VERSION) || defined (MINIX)
X #define WSTATUS(t) (t)
X #else
X #define WSTATUS(t) (t.w_status)
X***************
X*** 123,129 ****
X #endif /* WSTOPSIG */
X
X #if !defined (WIFCORED)
X! #if !defined (_POSIX_VERSION)
X #define WIFCORED(s) ((s).w_coredump)
X #else
X #define WIFCORED(s) ((s) & 0200)
X--- 123,129 ----
X #endif /* WSTOPSIG */
X
X #if !defined (WIFCORED)
X! #if !defined (_POSIX_VERSION) && !defined (MINIX)
X #define WIFCORED(s) ((s).w_coredump)
X #else
X #define WIFCORED(s) ((s) & 0200)
X***************
X*** 179,185 ****
X #define SIGCHLD SIGCLD
X #endif
X
X! #if !defined (_POSIX_VERSION)
X #if !defined (SIG_BLOCK)
X #define SIG_BLOCK 2
X #define SIG_SETMASK 3
X--- 179,185 ----
X #define SIGCHLD SIGCLD
X #endif
X
X! #if !defined (_POSIX_VERSION) && !defined (MINIX)
X #if !defined (SIG_BLOCK)
X #define SIG_BLOCK 2
X #define SIG_SETMASK 3
X*** 1.1 1991/05/27 20:04:17
X--- machines.h 1991/05/29 20:20:05
X***************
X*** 211,216 ****
X--- 211,240 ----
X #endif
X #endif /* mips */
X
X+ /* **************************************** */
X+ /* */
X+ /* Pc532 running Minix 1.5 */
X+ /* (with Bison installed) */
X+ /* */
X+ /* **************************************** */
X+
X+ #if defined (pc532)
X+ #define M_MACHINE "pc532"
X+ #define M_OS Minix
X+ #define REQUIRED_LIBRARIES
X+ /* #define HAVE_SIGLIST */
X+ #define HAVE_GCC
X+ /* #define USE_GNU_TERMCAP */
X+ /* #define HAVE_SETLINEBUF */
X+ /* #define HAVE_VPRINTF */
X+ /* #define HAVE_MULTIPLE_GROUPS */
X+ #undef USE_GNU_MALLOC
X+ #undef HAVE_GETWD
X+ #define SYSDEP_CFLAGS -DUSG -D_POSIX_SOURCE -DDIRENT -DHOSTNAME=\"abbor\"
X+ /* #define USE_TERMCAP_EMULATION */
X+ #define VOID_SIGHANDLER
X+ #endif /* Pc532 */
X+
X /* ************************ */
X /* */
X /* Pyramid */
X*** 1.1 1991/05/27 20:50:40
X--- nojobs.c 1991/05/29 19:45:28
X***************
X*** 31,36 ****
X--- 31,43 ----
X #include "general.h"
X #include "jobs.h"
X
X+ #if defined (MINIX)
X+ #undef USG
X+ #if !defined (TIOCSETN)
X+ #define TIOCSETN TIOCSETP
X+ #endif
X+ #endif
X+
X #if !defined (USG) && !defined (_POSIX_VERSION)
X # include <sgtty.h>
X #else
X***************
X*** 50,56 ****
X #define killpg(pg, sig) kill(-(pg),(sig))
X #endif
X
X! #if defined (USG)
X #define siginterrupt(sig, code)
X #endif
X
X--- 57,63 ----
X #define killpg(pg, sig) kill(-(pg),(sig))
X #endif
X
X! #if defined (USG) || defined (MINIX)
X #define siginterrupt(sig, code)
X #endif
X
X***************
X*** 220,226 ****
X {
X if (got_pid < 0 && errno == ECHILD)
X {
X! #if !defined (_POSIX_VERSION)
X status.w_termsig = status.w_retcode = 0;
X #else
X status = 0;
X--- 227,233 ----
X {
X if (got_pid < 0 && errno == ECHILD)
X {
X! #if !defined (_POSIX_VERSION) && !defined (MINIX)
X status.w_termsig = status.w_retcode = 0;
X #else
X status = 0;
X*** 1.1 1991/05/28 19:06:00
X--- siglist.c 1991/05/28 19:06:40
X***************
X*** 19,25 ****
X--- 19,29 ----
X Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
X
X #include <stdio.h>
X+ #if defined (MINIX)
X+ #include <signal.h>
X+ #else
X #include <sys/signal.h>
X+ #endif
X
X #ifndef NSIG
X # define NSIG 64
X*** 1.1 1991/05/28 17:53:55
X--- subst.c 1991/05/28 17:56:40
X***************
X*** 20,25 ****
X--- 20,28 ----
X Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
X
X #include <stdio.h>
X+ #if defined (MINIX)
X+ #include <sys/types.h>
X+ #endif
X #include <pwd.h>
X #include <fcntl.h>
X #include <signal.h>
X*** 1.1 1991/05/28 18:58:22
X--- test.c 1991/05/28 19:00:43
X***************
X*** 25,36 ****
X /* #define STANDALONE */
X
X #include <stdio.h>
X
X #if !defined (sony)
X #include <fcntl.h>
X #endif
X
X- #include <sys/types.h>
X #include "general.h"
X #include "posixstat.h"
X #include <sys/file.h>
X--- 25,36 ----
X /* #define STANDALONE */
X
X #include <stdio.h>
X+ #include <sys/types.h>
X
X #if !defined (sony)
X #include <fcntl.h>
X #endif
X
X #include "general.h"
X #include "posixstat.h"
X #include <sys/file.h>
X*** 1.1 1991/05/27 20:33:42
X--- variables.c 1991/05/27 20:34:09
X***************
X*** 20,27 ****
X
X #include <stdio.h>
X #include <ctype.h>
X- #include <pwd.h>
X #include <sys/types.h>
X
X #include "shell.h"
X #include "hash.h"
X--- 20,27 ----
X
X #include <stdio.h>
X #include <ctype.h>
X #include <sys/types.h>
X+ #include <pwd.h>
X
X #include "shell.h"
X #include "hash.h"
END_OF_bash.diff
if test 16091 -ne `wc -c <bash.diff`; then
echo shar: \"bash.diff\" unpacked with wrong size!
fi
# end of overwriting check
fi
echo shar: End of shell archive.
exit 0