diff -rc shellutils-1.9.4-fsf/INSTALL shellutils-1.9.4-amiga/INSTALL
*** shellutils-1.9.4-fsf/INSTALL	Wed Sep 15 23:05:10 1993
--- shellutils-1.9.4-amiga/INSTALL	Mon Feb 21 21:58:46 1994
***************
*** 35,42 ****
  where DIR is the directory that contains the source code.
  
     By default, `make install' will install the package's files in
! `/usr/local/bin', `/usr/local/man', etc.  You can specify an
! installation prefix other than `/usr/local' by giving `configure' the
  option `--prefix=PATH'.  Alternately, you can do so by consistently
  giving a value for the `prefix' variable when you run `make', e.g.,
       make prefix=/usr/gnu
--- 35,42 ----
  where DIR is the directory that contains the source code.
  
     By default, `make install' will install the package's files in
! `/gnu/bin', `/gnu/man', etc.  You can specify an
! installation prefix other than `/gnu' by giving `configure' the
  option `--prefix=PATH'.  Alternately, you can do so by consistently
  giving a value for the `prefix' variable when you run `make', e.g.,
       make prefix=/usr/gnu
diff -rc shellutils-1.9.4-fsf/Makefile.in shellutils-1.9.4-amiga/Makefile.in
*** shellutils-1.9.4-fsf/Makefile.in	Sun Feb 20 01:11:56 1994
--- shellutils-1.9.4-amiga/Makefile.in	Mon Feb 21 22:01:24 1994
***************
*** 25,31 ****
  srcdir = @srcdir@
  VPATH = @srcdir@
  
! prefix = /usr/local
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
  libdir = $(exec_prefix)/lib
--- 25,31 ----
  srcdir = @srcdir@
  VPATH = @srcdir@
  
! prefix = /gnu
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
  libdir = $(exec_prefix)/lib
***************
*** 38,45 ****
  NEWS configure configure.in config.h.in acconfig.h mkinstalldirs install.sh
  
  # Redundant stuff for making only selected programs.
! PROGS = basename date dirname echo env expr false groups id logname \
! pathchk printenv printf sleep tee test true tty who whoami yes @PROGS@
  
  # Subdirectories to run make in for the primary targets.
  SUBDIRS = lib src man
--- 38,45 ----
  NEWS configure configure.in config.h.in acconfig.h mkinstalldirs install.sh
  
  # Redundant stuff for making only selected programs.
! PROGS = basename date dirname echo env expr id logname \
! pathchk printenv printf sleep tee test whoami yes @PROGS@
  
  # Subdirectories to run make in for the primary targets.
  SUBDIRS = lib src man
***************
*** 57,63 ****
  check:
  installcheck:
  
! $(PROGS) su:
  	cd lib; $(MAKE) all
  	cd src; $(MAKE) $@
  
--- 57,63 ----
  check:
  installcheck:
  
! $(PROGS):
  	cd lib; $(MAKE) all
  	cd src; $(MAKE) $@
  
diff -rc shellutils-1.9.4-fsf/configure shellutils-1.9.4-amiga/configure
*** shellutils-1.9.4-fsf/configure	Thu Feb 10 14:59:49 1994
--- shellutils-1.9.4-amiga/configure	Mon Feb 21 22:17:54 1994
***************
*** 102,108 ****
    srcdirdefaulted=yes
    # Try the directory containing this script, then `..'.
    prog=$0
!   confdir=`echo $prog|sed 's%/[^/][^/]*$%%'`
    test "X$confdir" = "X$prog" && confdir=.
    srcdir=$confdir
    if test ! -r $srcdir/$unique_file; then
--- 102,108 ----
    srcdirdefaulted=yes
    # Try the directory containing this script, then `..'.
    prog=$0
!   confdir=`echo $prog| sed 's|/$||' | sed 's|//|/|' | sed 's|/[^/]*$||'`
    test "X$confdir" = "X$prog" && confdir=.
    srcdir=$confdir
    if test ! -r $srcdir/$unique_file; then
***************
*** 131,136 ****
--- 131,138 ----
  
  
  # We want these before the checks, so the checks can modify their values.
+ CFLAGS="-O2"	#HACK (fnf)
+ LDFLAGS=""	#HACK (fnf)
  test -z "$CFLAGS" && CFLAGS=-g auto_cflags=1
  
  if test -z "$CC"; then
***************
*** 415,421 ****
  
  echo checking for POSIXized ISC
  if test -d /etc/conf/kconfig.d &&
!   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
  then
    ISC=1 # If later tests want to check for ISC.
    
--- 417,423 ----
  
  echo checking for POSIXized ISC
  if test -d /etc/conf/kconfig.d &&
!   grep _POSIX_VERSION /gnu/include/sys/unistd.h >/dev/null 2>&1
  then
    ISC=1 # If later tests want to check for ISC.
    
***************
*** 1001,1007 ****
  EOF
  if eval $compile; then
    rm -rf conftest*
!   PROGS="$PROGS nice nohup" MAN="$MAN nice.1 nohup.1"
  
  fi
  rm -f conftest*
--- 1003,1009 ----
  EOF
  if eval $compile; then
    rm -rf conftest*
!   PROGS="$PROGS nice" MAN="$MAN nice.1"
  
  fi
  rm -f conftest*
***************
*** 1029,1035 ****
  \${SEDeA}NICE_PRIORITY\${SEDeB}NICE_PRIORITY\${SEDeC}1\${SEDeD}
  "
  }
!  PROGS="$PROGS nice nohup" MAN="$MAN nice.1 nohup.1"
  
  fi
  rm -f conftest*
--- 1031,1037 ----
  \${SEDeA}NICE_PRIORITY\${SEDeB}NICE_PRIORITY\${SEDeC}1\${SEDeD}
  "
  }
!  PROGS="$PROGS nice" MAN="$MAN nice.1"
  
  fi
  rm -f conftest*
***************
*** 1139,1145 ****
  rm -f conftest*
  
  if test -n "$have_termios"; then
! PROGS="$PROGS stty" MAN="$MAN stty.1"
  echo checking for c_line in struct termios
  cat > conftest.c <<EOF
  #include "confdefs.h"
--- 1141,1147 ----
  rm -f conftest*
  
  if test -n "$have_termios"; then
! PROGS="$PROGS" MAN="$MAN"
  echo checking for c_line in struct termios
  cat > conftest.c <<EOF
  #include "confdefs.h"
diff -rc shellutils-1.9.4-fsf/lib/getusershell.c shellutils-1.9.4-amiga/lib/getusershell.c
*** shellutils-1.9.4-fsf/lib/getusershell.c	Sun Oct 17 03:38:20 1993
--- shellutils-1.9.4-amiga/lib/getusershell.c	Mon Feb 21 21:59:58 1994
***************
*** 50,56 ****
  /* List of shells to use if the shells file is missing. */
  static char const* const default_shells[] =
  {
!   "/bin/sh", "/bin/csh", "/usr/bin/sh", "/usr/bin/csh", NULL
  };
  
  /* Index of the next shell in `default_shells' to return.
--- 50,56 ----
  /* List of shells to use if the shells file is missing. */
  static char const* const default_shells[] =
  {
!   "/bin/sh", "/bin/ksh", "/bin/bash", NULL
  };
  
  /* Index of the next shell in `default_shells' to return.
diff -rc shellutils-1.9.4-fsf/man/Makefile.in shellutils-1.9.4-amiga/man/Makefile.in
*** shellutils-1.9.4-fsf/man/Makefile.in	Tue Feb  1 14:14:23 1994
--- shellutils-1.9.4-amiga/man/Makefile.in	Mon Feb 21 22:00:10 1994
***************
*** 20,26 ****
  srcdir = @srcdir@
  VPATH = @srcdir@
  
! prefix = /usr/local
  exec_prefix = $(prefix)
  mandir = $(prefix)/man/man1
  manprefix = $(binprefix)
--- 20,26 ----
  srcdir = @srcdir@
  VPATH = @srcdir@
  
! prefix = /gnu
  exec_prefix = $(prefix)
  mandir = $(prefix)/man/man1
  manprefix = $(binprefix)
diff -rc shellutils-1.9.4-fsf/src/Makefile.in shellutils-1.9.4-amiga/src/Makefile.in
*** shellutils-1.9.4-fsf/src/Makefile.in	Mon Feb 14 21:42:07 1994
--- shellutils-1.9.4-amiga/src/Makefile.in	Mon Feb 21 22:01:18 1994
***************
*** 20,26 ****
  srcdir = @srcdir@
  VPATH = @srcdir@
  
! prefix = /usr/local
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
  binprefix = 
--- 20,26 ----
  srcdir = @srcdir@
  VPATH = @srcdir@
  
! prefix = /gnu
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
  binprefix = 
***************
*** 44,53 ****
  DISTFILES = Makefile.in system.h $(SOURCES) groups.sh nohup.sh \
  false.sh true.sh version.h long-options.h
  
! PROGS = basename date dirname echo env expr false groups id logname \
! pathchk printenv printf sleep tee test true tty who whoami yes @PROGS@
  
! all: $(PROGS) su
  
  incl = -I.. -I$(srcdir) -I$(srcdir)/../lib
  .c.o:
--- 44,53 ----
  DISTFILES = Makefile.in system.h $(SOURCES) groups.sh nohup.sh \
  false.sh true.sh version.h long-options.h
  
! PROGS = basename date dirname echo env expr id logname \
! pathchk printenv printf sleep tee test whoami yes @PROGS@
  
! all: $(PROGS)
  
  incl = -I.. -I$(srcdir) -I$(srcdir)/../lib
  .c.o:
***************
*** 58,64 ****
  	    $(INSTALL_PROGRAM) $$f $(bindir)/$(binprefix)$$f; \
  	done
  	rm -f $(bindir)/'['; ln $(bindir)/$(binprefix)test $(bindir)/'['
! 	@if test `./id -u` = 0; then \
  	echo you are root, so installing su; \
  	$(INSTALL_PROGRAM) su $(bindir)/$(binprefix)su; \
  	chown root $(bindir)/$(binprefix)su; \
--- 58,64 ----
  	    $(INSTALL_PROGRAM) $$f $(bindir)/$(binprefix)$$f; \
  	done
  	rm -f $(bindir)/'['; ln $(bindir)/$(binprefix)test $(bindir)/'['
! 	@if false; then \
  	echo you are root, so installing su; \
  	$(INSTALL_PROGRAM) su $(bindir)/$(binprefix)su; \
  	chown root $(bindir)/$(binprefix)su; \
***************
*** 66,72 ****
  	else echo WARNING: you are not root, so not installing su; fi
  
  uninstall:
! 	for f in $(PROGS) su; do rm -f $(bindir)/$(binprefix)$$f; done
  	rm -f $(bindir)/'['
  
  TAGS: $(SOURCES)
--- 66,72 ----
  	else echo WARNING: you are not root, so not installing su; fi
  
  uninstall:
! 	for f in $(PROGS); do rm -f $(bindir)/$(binprefix)$$f; done
  	rm -f $(bindir)/'['
  
  TAGS: $(SOURCES)
diff -rc shellutils-1.9.4-fsf/src/basename.c shellutils-1.9.4-amiga/src/basename.c
*** shellutils-1.9.4-fsf/src/basename.c	Mon Feb 14 21:23:15 1994
--- shellutils-1.9.4-amiga/src/basename.c	Mon Feb 21 21:50:03 1994
***************
*** 73,79 ****
    exit (status);
  }
  
- void
  main (argc, argv)
       int argc;
       char **argv;
--- 73,78 ----
diff -rc shellutils-1.9.4-fsf/src/date.c shellutils-1.9.4-amiga/src/date.c
*** shellutils-1.9.4-fsf/src/date.c	Tue Feb  1 14:10:33 1994
--- shellutils-1.9.4-amiga/src/date.c	Mon Feb 21 21:50:05 1994
***************
*** 109,115 ****
    {NULL, 0, NULL, 0}
  };
  
- void
  main (argc, argv)
       int argc;
       char **argv;
--- 109,114 ----
diff -rc shellutils-1.9.4-fsf/src/dirname.c shellutils-1.9.4-amiga/src/dirname.c
*** shellutils-1.9.4-fsf/src/dirname.c	Mon Feb 14 21:23:16 1994
--- shellutils-1.9.4-amiga/src/dirname.c	Mon Feb 21 21:50:06 1994
***************
*** 62,68 ****
    exit (status);
  }
  
- void
  main (argc, argv)
       int argc;
       char **argv;
--- 62,67 ----
diff -rc shellutils-1.9.4-fsf/src/echo.c shellutils-1.9.4-amiga/src/echo.c
*** shellutils-1.9.4-fsf/src/echo.c	Tue Feb  1 14:10:34 1994
--- shellutils-1.9.4-amiga/src/echo.c	Mon Feb 21 21:50:07 1994
***************
*** 110,116 ****
  /* Print the words in LIST to standard output.  If the first word is
     `-n', then don't print a trailing newline.  We also support the
     echo syntax from Version 9 unix systems. */
! void
  main (argc, argv)
       int argc;
       char **argv;
--- 110,116 ----
  /* Print the words in LIST to standard output.  If the first word is
     `-n', then don't print a trailing newline.  We also support the
     echo syntax from Version 9 unix systems. */
! 
  main (argc, argv)
       int argc;
       char **argv;
diff -rc shellutils-1.9.4-fsf/src/env.c shellutils-1.9.4-amiga/src/env.c
*** shellutils-1.9.4-fsf/src/env.c	Tue Feb  1 14:10:35 1994
--- shellutils-1.9.4-amiga/src/env.c	Mon Feb 21 21:50:08 1994
***************
*** 121,127 ****
    {NULL, 0, NULL, 0}
  };
  
- void
  main (argc, argv, envp)
       register int argc;
       register char **argv;
--- 121,126 ----
diff -rc shellutils-1.9.4-fsf/src/expr.c shellutils-1.9.4-amiga/src/expr.c
*** shellutils-1.9.4-fsf/src/expr.c	Wed Dec 22 21:53:24 1993
--- shellutils-1.9.4-amiga/src/expr.c	Mon Feb 21 21:50:10 1994
***************
*** 169,175 ****
    exit (status);
  }
  
- void
  main (argc, argv)
       int argc;
       char **argv;
--- 169,174 ----
diff -rc shellutils-1.9.4-fsf/src/id.c shellutils-1.9.4-amiga/src/id.c
*** shellutils-1.9.4-fsf/src/id.c	Tue Feb  1 14:10:36 1994
--- shellutils-1.9.4-amiga/src/id.c	Mon Feb 21 21:50:11 1994
***************
*** 112,118 ****
    {NULL, 0, NULL, 0}
  };
  
- void
  main (argc, argv)
       int argc;
       char **argv;
--- 112,117 ----
diff -rc shellutils-1.9.4-fsf/src/logname.c shellutils-1.9.4-amiga/src/logname.c
*** shellutils-1.9.4-fsf/src/logname.c	Tue Feb  1 14:10:37 1994
--- shellutils-1.9.4-amiga/src/logname.c	Mon Feb 21 21:50:12 1994
***************
*** 68,74 ****
    exit (status);
  }
  
- void
  main (argc, argv)
       int argc;
       char **argv;
--- 68,73 ----
diff -rc shellutils-1.9.4-fsf/src/nice.c shellutils-1.9.4-amiga/src/nice.c
*** shellutils-1.9.4-fsf/src/nice.c	Tue Feb  1 14:10:39 1994
--- shellutils-1.9.4-amiga/src/nice.c	Mon Feb 21 21:50:13 1994
***************
*** 67,73 ****
    {NULL, 0, NULL, 0}
  };
  
- void
  main (argc, argv)
       int argc;
       char **argv;
--- 67,72 ----
diff -rc shellutils-1.9.4-fsf/src/pathchk.c shellutils-1.9.4-amiga/src/pathchk.c
*** shellutils-1.9.4-fsf/src/pathchk.c	Tue Feb  1 14:10:40 1994
--- shellutils-1.9.4-amiga/src/pathchk.c	Mon Feb 21 21:50:15 1994
***************
*** 123,129 ****
    {NULL, 0, NULL, 0}
  };
  
- void
  main (argc, argv)
       int argc;
       char **argv;
--- 123,128 ----
diff -rc shellutils-1.9.4-fsf/src/printenv.c shellutils-1.9.4-amiga/src/printenv.c
*** shellutils-1.9.4-fsf/src/printenv.c	Tue Feb  1 14:10:40 1994
--- shellutils-1.9.4-amiga/src/printenv.c	Mon Feb 21 21:50:16 1994
***************
*** 86,92 ****
    exit (status);
  }
  
- void
  main (argc, argv)
       int argc;
       char **argv;
--- 86,91 ----
diff -rc shellutils-1.9.4-fsf/src/printf.c shellutils-1.9.4-amiga/src/printf.c
*** shellutils-1.9.4-fsf/src/printf.c	Tue Feb  1 14:10:41 1994
--- shellutils-1.9.4-amiga/src/printf.c	Mon Feb 21 21:50:17 1994
***************
*** 145,151 ****
    exit (status);
  }
  
- void
  main (argc, argv)
       int argc;
       char **argv;
--- 145,150 ----
diff -rc shellutils-1.9.4-fsf/src/sleep.c shellutils-1.9.4-amiga/src/sleep.c
*** shellutils-1.9.4-fsf/src/sleep.c	Thu Feb 10 19:11:03 1994
--- shellutils-1.9.4-amiga/src/sleep.c	Mon Feb 21 21:50:18 1994
***************
*** 74,80 ****
    exit (status);
  }
  
- void
  main (argc, argv)
       int argc;
       char **argv;
--- 74,79 ----
diff -rc shellutils-1.9.4-fsf/src/stty.c shellutils-1.9.4-amiga/src/stty.c
*** shellutils-1.9.4-fsf/src/stty.c	Sun Feb 20 00:31:04 1994
--- shellutils-1.9.4-amiga/src/stty.c	Mon Feb 21 21:50:20 1994
***************
*** 623,629 ****
    exit (status);
  }
  
- void
  main (argc, argv)
       int argc;
       char **argv;
--- 623,628 ----
diff -rc shellutils-1.9.4-fsf/src/su.c shellutils-1.9.4-amiga/src/su.c
*** shellutils-1.9.4-fsf/src/su.c	Tue Feb  1 14:10:45 1994
--- shellutils-1.9.4-amiga/src/su.c	Mon Feb 21 22:01:23 1994
***************
*** 130,139 ****
  #include "version.h"
  
  /* The default PATH for simulated logins to non-superuser accounts.  */
! #define DEFAULT_LOGIN_PATH ":/usr/ucb:/bin:/usr/bin"
  
  /* The default PATH for simulated logins to superuser accounts.  */
! #define DEFAULT_ROOT_LOGIN_PATH "/usr/ucb:/bin:/usr/bin:/etc"
  
  /* The shell to run if none is given in the user's passwd entry.  */
  #define DEFAULT_SHELL "/bin/sh"
--- 130,139 ----
  #include "version.h"
  
  /* The default PATH for simulated logins to non-superuser accounts.  */
! #define DEFAULT_LOGIN_PATH ":/bin"
  
  /* The default PATH for simulated logins to superuser accounts.  */
! #define DEFAULT_ROOT_LOGIN_PATH "/gnu"
  
  /* The shell to run if none is given in the user's passwd entry.  */
  #define DEFAULT_SHELL "/bin/sh"
***************
*** 194,200 ****
    {0, 0, 0, 0}
  };
  
- void
  main (argc, argv)
       int argc;
       char **argv;
--- 194,199 ----
diff -rc shellutils-1.9.4-fsf/src/tee.c shellutils-1.9.4-amiga/src/tee.c
*** shellutils-1.9.4-fsf/src/tee.c	Tue Feb  1 14:10:46 1994
--- shellutils-1.9.4-amiga/src/tee.c	Mon Feb 21 21:50:23 1994
***************
*** 87,93 ****
    exit (status);
  }
  
- void
  main (argc, argv)
       int argc;
       char **argv;
--- 87,92 ----
diff -rc shellutils-1.9.4-fsf/src/tty.c shellutils-1.9.4-amiga/src/tty.c
*** shellutils-1.9.4-fsf/src/tty.c	Tue Feb  1 14:10:49 1994
--- shellutils-1.9.4-amiga/src/tty.c	Mon Feb 21 21:50:24 1994
***************
*** 65,71 ****
    {NULL, 0, NULL, 0}
  };
  
- void
  main (argc, argv)
       int argc;
       char **argv;
--- 65,70 ----
diff -rc shellutils-1.9.4-fsf/src/uname.c shellutils-1.9.4-amiga/src/uname.c
*** shellutils-1.9.4-fsf/src/uname.c	Tue Feb  1 14:10:50 1994
--- shellutils-1.9.4-amiga/src/uname.c	Mon Feb 21 21:50:25 1994
***************
*** 92,98 ****
    {NULL, 0, NULL, 0}
  };
  
- void
  main (argc, argv)
       int argc;
       char **argv;
--- 92,97 ----
diff -rc shellutils-1.9.4-fsf/src/who.c shellutils-1.9.4-amiga/src/who.c
*** shellutils-1.9.4-fsf/src/who.c	Tue Feb  1 14:10:51 1994
--- shellutils-1.9.4-amiga/src/who.c	Mon Feb 21 21:50:27 1994
***************
*** 138,144 ****
    {NULL, 0, NULL, 0}
  };
  
- void
  main (argc, argv)
       int argc;
       char **argv;
--- 138,143 ----
diff -rc shellutils-1.9.4-fsf/src/whoami.c shellutils-1.9.4-amiga/src/whoami.c
*** shellutils-1.9.4-fsf/src/whoami.c	Tue Feb  1 14:10:52 1994
--- shellutils-1.9.4-amiga/src/whoami.c	Mon Feb 21 21:50:28 1994
***************
*** 74,80 ****
    exit (status);
  }
  
- void
  main (argc, argv)
       int argc;
       char *argv[];
--- 74,79 ----
diff -rc shellutils-1.9.4-fsf/src/yes.c shellutils-1.9.4-amiga/src/yes.c
*** shellutils-1.9.4-fsf/src/yes.c	Tue Feb  1 14:10:52 1994
--- shellutils-1.9.4-amiga/src/yes.c	Mon Feb 21 21:50:29 1994
***************
*** 58,64 ****
    exit (status);
  }
  
- void
  main (argc, argv)
       int argc;
       char **argv;
--- 58,63 ----