merge with 1.8.1e

diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index 8ea587c5a37ffb258cfef7ac7dc3ce312b908bab..d3989a2e333adeefe28ba18f77960adb928b754e 100644 (file)
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -3,6 +3,8 @@ Tue Oct 12 00:53:26 1993  Jim Meyering  (meyering@comco.com)
        * stime.c [HAVE_CONFIG_H, CONFIG_BROKETS]: Include <config.h>
        or "config.h".
 
+       * src/Makefile.in [clean]: Also delete '['.
+
 Sun Oct 10 14:05:23 1993  Jim Meyering  meyering@comco.com
 
        * false.sh, groups.sh, nohup.sh, true.sh: Add --help and --version.

diff --git a/src/test.c b/src/test.c
index 658a30f291b6c8413e43ae3765eb40b10a4c3f6f..084cad89c0cb1ed5ceb63750884dbb17f2398e60 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -276,7 +276,7 @@ advance (f)
  * beyond - call when we're beyond the end of the argument list (an
  *     error condition)
  */
-static int
+static void
 beyond ()
 {
   test_syntax_error ("argument expected\n", (char *)NULL);
@@ -674,6 +674,9 @@ binary_operator ()
       pos += 3;
       return (TRUE == value);
     }
+
+  /* Not reached.  */
+  abort ();
 }
 
 static int