My patches for Linux, readline and signals (2 of 2)

My patches for Linux, readline and signals (2 of 2)

[Tom Culliton]

(This is the second of two parts.  The first are my patches against
rc-1.5betadev-1, which are a collection of "fix only" patches from the
mailing list and my own work. The second is my Linux configuration,
which should also be generally useful for using readline and building
on Posix systems.  So without further ado...)

*** rc-1.5betadev-1/config.h-dist	Mon May 25 14:12:57 1992
--- rc-1.5tjc/config.h	Wed Mar  5 21:25:46 1997
***************
*** 6,13 ****
   * system matches one of them; you can search for the beginning of the
   * defaults section by looking for the string "#ifndef CUSTOM"). If you
   * want to override the suggested defaults, define the macro CUSTOM.
- #define CUSTOM
   */
  
  /*
   * (Note that certain default settings redefine this macro)
--- 6,13 ----
   * system matches one of them; you can search for the beginning of the
   * defaults section by looking for the string "#ifndef CUSTOM"). If you
   * want to override the suggested defaults, define the macro CUSTOM.
   */
+ #define CUSTOM
  
  /*
   * (Note that certain default settings redefine this macro)
***************
*** 16,22 ****
   * something sensible for your system if you don't like the path shown
   * below.
   */
! #define DEFAULTPATH "/usr/ucb", "/usr/bin", "/bin", "."
  
  /*
   * Define the macro NODIRENT if your system has <sys/dir.h> but not
--- 16,22 ----
   * something sensible for your system if you don't like the path shown
   * below.
   */
! #define DEFAULTPATH "/usr/local/bin", "/usr/bin", "/bin", "."
  
  /*
   * Define the macro NODIRENT if your system has <sys/dir.h> but not
***************
*** 30,37 ****
   * after returning from an interrupt handler. (If you are not sure what
   * this means, see the man page for signal(2). In any case, it is probably
   * safe to leave this macro undefined.)
- #define SVSIGS
   */
  
  /*
   * Define the macro NOCMDARG if you do not have /dev/fd or fifos on your
--- 30,37 ----
   * after returning from an interrupt handler. (If you are not sure what
   * this means, see the man page for signal(2). In any case, it is probably
   * safe to leave this macro undefined.)
   */
+ #define SVSIGS
  
  /*
   * Define the macro NOCMDARG if you do not have /dev/fd or fifos on your
***************
*** 60,73 ****
  /*
   * Define the macro NOSIGCLD if your system uses SIGCLD in the System
   * V way. (e.g., sgi's Irix)
- #define NOSIGCLD
   */
  
  /*
   * Define the macro READLINE if you want rc to call GNU readline
   * instead of read(2) on interactive shells.
- #define READLINE
   */
  
  /*
   * Define the macro NOEXECVE if your Unix does not interpret #! in the
--- 60,73 ----
  /*
   * Define the macro NOSIGCLD if your system uses SIGCLD in the System
   * V way. (e.g., sgi's Irix)
   */
+ #define NOSIGCLD
  
  /*
   * Define the macro READLINE if you want rc to call GNU readline
   * instead of read(2) on interactive shells.
   */
+ #define READLINE
  
  /*
   * Define the macro NOEXECVE if your Unix does not interpret #! in the
***************
*** 78,85 ****
  /*
   * If you want rc to default to some interpreter for files which don't
   * have a legal #! on the first line, define the macro DEFAULTINTERP.
- #define DEFAULTINTERP "/bin/sh"
   */
  
  /*
   * If your /bin/sh (or another program you care about) rejects environment
--- 78,85 ----
  /*
   * If you want rc to default to some interpreter for files which don't
   * have a legal #! on the first line, define the macro DEFAULTINTERP.
   */
+ #define DEFAULTINTERP "/bin/sh"
  
  /*
   * If your /bin/sh (or another program you care about) rejects environment
***************
*** 88,95 ****
   * define PROTECT_ENV for this hack. (Known offenders: every sh I have tried;
   * SunOS (silently discards), NeXT (aborts with error), SGI (aborts with
   * error), Ultrix (sh seems to work, sh5 aborts with error))
- #define PROTECT_ENV
   */
  
  /*
   * Define the macro NOECHO if you wish to omit rc's echo builtin from the
--- 88,95 ----
   * define PROTECT_ENV for this hack. (Known offenders: every sh I have tried;
   * SunOS (silently discards), NeXT (aborts with error), SGI (aborts with
   * error), Ultrix (sh seems to work, sh5 aborts with error))
   */
+ #define PROTECT_ENV
  
  /*
   * Define the macro NOECHO if you wish to omit rc's echo builtin from the
*** rc-1.5betadev-1/Makefile	Sun Mar  6 22:32:46 1994
--- rc-1.5tjc/makefile	Wed Mar  5 21:26:00 1997
***************
*** 16,28 ****
  #ADDON=addon.o
  
  # Use an ANSI compiler (or at least one that groks prototypes and void *):
! CC=gcc -g -O
! CFLAGS=
! LDFLAGS=
  
  # You may substitute "bison -y" for yacc. (You want to choose the one that
  # makes a smaller y.tab.c. Also see the README about Sun's yacc.)
! YACC=yacc
  
  OBJS=$(ADDON) builtins.o except.o exec.o $(EXECVE) fn.o footobar.o getopt.o \
  	glob.o glom.o hash.o heredoc.o input.o lex.o list.o main.o match.o \
--- 16,30 ----
  #ADDON=addon.o
  
  # Use an ANSI compiler (or at least one that groks prototypes and void *):
! CC=gcc
! CFLAGS=-Wall -O2 -fomit-frame-pointer -funroll-loops -DSYSVR4 -DUSESIGSETJMP
! #CFLAGS=-Wall -g -fomit-frame-pointer -funroll-loops -DSYSVR4 -DUSESIGSETJMP
! LDFLAGS=-s -static -lreadline -ltermcap
! #LDFLAGS= -static -lreadline -ltermcap
  
  # You may substitute "bison -y" for yacc. (You want to choose the one that
  # makes a smaller y.tab.c. Also see the README about Sun's yacc.)
! YACC=bison -y
  
  OBJS=$(ADDON) builtins.o except.o exec.o $(EXECVE) fn.o footobar.o getopt.o \
  	glob.o glom.o hash.o heredoc.o input.o lex.o list.o main.o match.o \
***************
*** 38,44 ****
  	$(CC) -o $@ $(OBJS) $(LDFLAGS)
  
  sigmsgs.c: mksignal
! 	sh mksignal /usr/include/sys/signal.h
  
  y.tab.c: parse.y
  	$(YACC) -d parse.y
--- 40,46 ----
  	$(CC) -o $@ $(OBJS) $(LDFLAGS)
  
  sigmsgs.c: mksignal
! 	sh mksignal /usr/include/asm/signal.h
  
  y.tab.c: parse.y
  	$(YACC) -d parse.y
***************
*** 50,56 ****
  	./rc -p < trip.rc
  
  clean: force
! 	rm -f *.o *.tab.* sigmsgs.*
  
  history: force
  	cd history; make CC="$(CC)" $(HISTORYMAKEFLAGS)
--- 52,58 ----
  	./rc -p < trip.rc
  
  clean: force
! 	rm -f *.o *.tab.* sigmsgs.* core
  
  history: force
  	cd history; make CC="$(CC)" $(HISTORYMAKEFLAGS)