merge with 1.8.1h

22 files changed, 56 insertions, 36 deletions

diff --git a/lib/getusershell.c b/lib/getusershell.c
index 2607535f2..9eb2520b0 100644
--- a/lib/getusershell.c
+++ b/lib/getusershell.c
@@ -43,6 +43,8 @@ char *malloc ();
 char *realloc ();
 #endif
 
+char *xstrdup ();
+
 static int readname ();
 
 /* List of shells to use if the shells file is missing. */
@@ -65,6 +67,8 @@ static char *line = NULL;
 static int line_size = 0;
 
 /* Return an entry from the shells file, ignoring comment lines.
+   If the file doesn't exist, use the list in DEFAULT_SHELLS (above).
+   In any case, the returned string is in memory allocated through malloc.
    Return NULL if there are no more entries.  */
 
 char *
@@ -74,7 +78,7 @@ getusershell ()
     {
       if (default_shells[default_index])
 	/* Not at the end of the list yet.  */
-	return default_shells[default_index++];
+	return xstrdup (default_shells[default_index++]);
       return NULL;
     }
 
@@ -85,7 +89,7 @@ getusershell ()
 	{
 	  /* No shells file.  Use the default list.  */
 	  default_index = 1;
-	  return default_shells[0];
+	  return xstrdup (default_shells[0]);
 	}
     }
 
diff --git a/lib/putenv.c b/lib/putenv.c
index 573e62478..47f7256e5 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -36,6 +36,8 @@ Cambridge, MA 02139, USA.  */
 /* Don't include stdlib.h for non-GNU C libraries because some of them
    contain conflicting prototypes for getopt.  */
 #include <stdlib.h>
+#else
+char *malloc ();
 #endif	/* GNU C library.  */
 
 #ifndef STDC_HEADERS
@@ -104,7 +106,8 @@ putenv (string)
       char **new_environ = (char **) malloc ((size + 2) * sizeof (char *));
       if (new_environ == NULL)
 	return -1;
-      (void) bcopy ((char *) environ, (char *) new_environ, size * sizeof (char *));
+      (void) bcopy ((char *) environ, (char *) new_environ,
+		    size * sizeof (char *));
       new_environ[size] = (char *) string;
       new_environ[size + 1] = NULL;
       if (last_environ != NULL)
diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index 4a635002b..4ba295151 100644
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -1,3 +1,16 @@
+Sun Oct 24 14:10:23 1993  Jim Meyering  (meyering@comco.com)
+
+	* long-options.c: Save and restore optind, too.
+	* long-options.h: New file.
+	* long-options.c, echo.c, expr.c, printf.c, test.c, yes.c:
+	Include it instead of duplicating dcls.
+	* src/Makefile.in: Add dependencies for it.
+
+Tue Oct 19 00:26:27 1993  Jim Meyering  (meyering@comco.com)
+
+	* expr.c [!__STDC__]: Don't define away `const'.  configure alone
+	decides whether to do that.  From Francois Pinard.
+
 Sat Oct 16 22:32:54 1993  Jim Meyering  (meyering@comco.com)
 
 	* whoami.c (main): Cast printf arg UID so it matches the type
diff --git a/src/basename.c b/src/basename.c
index 167b502d3..6c8e7fe55 100644
--- a/src/basename.c
+++ b/src/basename.c
@@ -74,7 +74,7 @@ Usage: %s [OPTION]... PATH [SUFFIX]\n\
 	   program_name);
 
   if (status != 0)
-    fprintf (stderr, "\nTry `%s --help' for more information.\n",
+    fprintf (stderr, "Try `%s --help' for more information.\n",
 	     program_name);
   else
 
diff --git a/src/date.c b/src/date.c
index 2bb28cdbc..9e5605ca7 100644
--- a/src/date.c
+++ b/src/date.c
@@ -230,7 +230,7 @@ Usage: %s [OPTION]... [+FORMAT] [MMDDhhmm[[CC]YY][.ss]]\n\
 	   program_name);
 
   if (status != 0)
-    fprintf (stderr, "\nTry `%s --help' for more information.\n",
+    fprintf (stderr, "Try `%s --help' for more information.\n",
 	     program_name);
   else
     {
diff --git a/src/dirname.c b/src/dirname.c
index 0aebb9793..a40c8267d 100644
--- a/src/dirname.c
+++ b/src/dirname.c
@@ -63,7 +63,7 @@ Usage: %s [OPTION]... PATH\n\
 	   program_name);
 
   if (status != 0)
-    fprintf (stderr, "\nTry `%s --help' for more information.\n",
+    fprintf (stderr, "Try `%s --help' for more information.\n",
 	     program_name);
   else
 
diff --git a/src/echo.c b/src/echo.c
index 6c514fc8c..4a2f673de 100644
--- a/src/echo.c
+++ b/src/echo.c
@@ -31,6 +31,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <stdio.h>
 #include <sys/types.h>
 #include "system.h"
+#include "long-options.h"
 
 /* echo [-neE] [arg ...]
 Output the ARGs.  If -n is specified, the trailing newline is
@@ -71,8 +72,6 @@ on System V systems with the -E option.
 /* The name this program was run with. */
 char *program_name;
 
-void parse_long_options ();
-
 static void
 usage (status)
      int status;
@@ -83,7 +82,7 @@ Usage: %s [OPTION]... [STRING]...\n\
 	   program_name);
 
   if (status != 0)
-    fprintf (stderr, "\nTry `%s --help' for more information.\n",
+    fprintf (stderr, "Try `%s --help' for more information.\n",
 	     program_name);
   else
 
diff --git a/src/env.c b/src/env.c
index 2f448c7b1..2fb0d7ec9 100644
--- a/src/env.c
+++ b/src/env.c
@@ -201,7 +201,7 @@ Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n\
 	   program_name);
 
   if (status != 0)
-    fprintf (stderr, "\nTry `%s --help' for more information.\n",
+    fprintf (stderr, "Try `%s --help' for more information.\n",
 	     program_name);
   else
 
@@ -209,8 +209,8 @@ Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n\
 \n\
   -u, --unset NAME           remove variable from the environment\n\
   -i, --ignore-environment   start with an empty environment\n\
-  --help                     display this help and exit\n\
-  --version                  output version information and exit\n\
+      --help                 display this help and exit\n\
+      --version              output version information and exit\n\
 \n\
 A mere - implies -i.  If no COMMAND, print the resulting environment.\n\
 ");
diff --git a/src/expr.c b/src/expr.c
index b39799eba..22e7e83cc 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -46,6 +46,7 @@
 
 #include "system.h"
 #include "version.h"
+#include "long-option.h"
 
 #if !defined (isascii) || defined (STDC_HEADERS)
 #undef isascii
@@ -54,10 +55,6 @@
 
 #define ISDIGIT(c) (isascii (c) && isdigit (c))
 
-#if !__STDC__
-#define const
-#endif
-
 #define NEW(type) ((type *) xmalloc (sizeof (type)))
 #define OLD(x) free ((char *) x)
 
@@ -91,7 +88,6 @@ void error ();
 char *xstrdup ();
 char *strstr ();
 char *xmalloc ();
-void parse_long_options ();
 
 static VALUE *docolon ();
 static VALUE *eval ();
@@ -121,7 +117,7 @@ Usage: %s EXPRESSION\n\
 	   program_name, program_name);
 
   if (status != 0)
-    fprintf (stderr, "\nTry `%s --help' for more information.\n",
+    fprintf (stderr, "Try `%s --help' for more information.\n",
 	     program_name);
   else
     {
@@ -155,7 +151,12 @@ separates increasing precedence groups.  EXPRESSION may be:\n\
 \n\
   STRING : REGEXP   anchored pattern match of REGEXP in STRING\n\
 \n\
-  ( EXPRESSION )    value of EXPRESSION\n\
+  match STRING REGEXP        same as STRING : REGEXP\n\
+  substr STRING POS LENGTH   substring of STRING, POS counted from 1\n\
+  index STRING CHARS         index in STRING where any CHARS is found, or 0\n\
+  length STRING              length of STRING\n\
+\n\
+  ( EXPRESSION )             value of EXPRESSION\n\
 ");
       printf ("\
 \n\
diff --git a/src/id.c b/src/id.c
index 520044449..3f2b32c5b 100644
--- a/src/id.c
+++ b/src/id.c
@@ -369,7 +369,7 @@ Usage: %s [OPTION]... [USERNAME]\n\
 	   program_name);
 
   if (status != 0)
-    fprintf (stderr, "\nTry `%s --help' for more information.\n",
+    fprintf (stderr, "Try `%s --help' for more information.\n",
 	     program_name);
   else
 
diff --git a/src/logname.c b/src/logname.c
index a75208d10..f8fcf3821 100644
--- a/src/logname.c
+++ b/src/logname.c
@@ -59,7 +59,7 @@ Usage: %s [OPTION]...\n\
 	   program_name);
 
   if (status != 0)
-    fprintf (stderr, "\nTry `%s --help' for more information.\n",
+    fprintf (stderr, "Try `%s --help' for more information.\n",
 	     program_name);
   else
 
diff --git a/src/nice.c b/src/nice.c
index 74bac8835..616a8f31c 100644
--- a/src/nice.c
+++ b/src/nice.c
@@ -180,7 +180,7 @@ Usage: %s [OPTION]... [COMMAND [ARG]...]\n\
 	   program_name);
 
   if (status != 0)
-    fprintf (stderr, "\nTry `%s --help' for more information.\n",
+    fprintf (stderr, "Try `%s --help' for more information.\n",
 	     program_name);
   else
 
@@ -188,8 +188,8 @@ Usage: %s [OPTION]... [COMMAND [ARG]...]\n\
 \n\
   -ADJUST                   increment priority by ADJUST first\n\
   -n, --adjustment ADJUST   same as -ADJUST\n\
-  --help                    display this help and exit\n\
-  --version                 output version information and exit\n\
+      --help                display this help and exit\n\
+      --version             output version information and exit\n\
 \n\
 With no COMMAND, print the current scheduling priority.  ADJUST is 10\n\
 by default.  Range goes from -20 (highest priority) to 19 (lowest).\n\
diff --git a/src/pathchk.c b/src/pathchk.c
index 760742d1b..afb663a62 100644
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -367,7 +367,7 @@ Usage: %s [OPTION]... PATH...\n\
 	   program_name);
 
   if (status != 0)
-    fprintf (stderr, "\nTry `%s --help' for more information.\n",
+    fprintf (stderr, "Try `%s --help' for more information.\n",
 	     program_name);
   else
 
diff --git a/src/printf.c b/src/printf.c
index ca13af365..c6d476b6f 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -61,6 +61,7 @@
 
 #include "system.h"
 #include "version.h"
+#include "long-option.h"
 
 #if !defined (isascii) || defined (STDC_HEADERS)
 #undef isascii
@@ -82,7 +83,6 @@ unsigned long strtoul ();
 
 char *xmalloc ();
 void error ();
-void parse_long_options ();
 
 static double xstrtod ();
 static int print_esc ();
@@ -111,7 +111,7 @@ Usage: %s FORMAT [ARGUMENT]...\n\
 	   program_name, program_name);
 
   if (status != 0)
-    fprintf (stderr, "\nTry `%s --help' for more information.\n",
+    fprintf (stderr, "Try `%s --help' for more information.\n",
 	     program_name);
   else
 
diff --git a/src/sleep.c b/src/sleep.c
index 168c31b91..a98ce9da9 100644
--- a/src/sleep.c
+++ b/src/sleep.c
@@ -63,7 +63,7 @@ Usage: %s [OPTION]... NUMBER[SUFFIX]\n\
 	   program_name);
 
   if (status != 0)
-    fprintf (stderr, "\nTry `%s --help' for more information.\n",
+    fprintf (stderr, "Try `%s --help' for more information.\n",
 	     program_name);
   else
 
diff --git a/src/stty.c b/src/stty.c
index dec68a7a7..c4d0946b2 100644
--- a/src/stty.c
+++ b/src/stty.c
@@ -452,7 +452,7 @@ Usage: %s [OPTION]... [SETTING]...\n\
 	   program_name);
 
   if (status != 0)
-    fprintf (stderr, "\nTry `%s --help' for more information.\n",
+    fprintf (stderr, "Try `%s --help' for more information.\n",
 	     program_name);
   else
     {
diff --git a/src/su.c b/src/su.c
index f80963b1d..7db31c107 100644
--- a/src/su.c
+++ b/src/su.c
@@ -557,7 +557,7 @@ Usage: %s [OPTION]... [-] [USER [ARG]...]\n\
 	   program_name);
 
   if (status != 0)
-    fprintf (stderr, "\nTry `%s --help' for more information.\n",
+    fprintf (stderr, "Try `%s --help' for more information.\n",
 	     program_name);
   else
 
diff --git a/src/tee.c b/src/tee.c
index d99782bde..66fccd9f8 100644
--- a/src/tee.c
+++ b/src/tee.c
@@ -76,7 +76,7 @@ Usage: %s [OPTION]... [FILE]...\n\
 	   program_name);
 
   if (status != 0)
-    fprintf (stderr, "\nTry `%s --help' for more information.\n",
+    fprintf (stderr, "Try `%s --help' for more information.\n",
 	     program_name);
   else
 
diff --git a/src/test.c b/src/test.c
index d1bc7ad28..c3d5c54cb 100644
--- a/src/test.c
+++ b/src/test.c
@@ -1008,7 +1008,7 @@ posixtest ()
 }
 
 #if defined (TEST_STANDALONE)
-void parse_long_options ();
+#include "long-option.h"
 
 static void
 usage (status)
@@ -1022,7 +1022,7 @@ Usage: %s EXPRESSION\n\
 	   program_name, program_name);
 
   if (status != 0)
-    fprintf (stderr, "\nTry `%s --help' for more information.\n",
+    fprintf (stderr, "Try `%s --help' for more information.\n",
 	     program_name);
   else
     {
diff --git a/src/tty.c b/src/tty.c
index 96505b9b4..83e3512ae 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -129,7 +129,7 @@ Usage: %s [OPTION]...\n\
 	   program_name);
 
   if (status != 0)
-    fprintf (stderr, "\nTry `%s --help' for more information.\n",
+    fprintf (stderr, "Try `%s --help' for more information.\n",
 	     program_name);
   else
 
diff --git a/src/uname.c b/src/uname.c
index 5d5ab0f3f..01b5f020c 100644
--- a/src/uname.c
+++ b/src/uname.c
@@ -194,7 +194,7 @@ Usage: %s [OPTION]...\n\
 	   program_name);
 
   if (status != 0)
-    fprintf (stderr, "\nTry `%s --help' for more information.\n",
+    fprintf (stderr, "Try `%s --help' for more information.\n",
 	     program_name);
   else
 
diff --git a/src/who.c b/src/who.c
index 16bd3523f..8b122c85b 100644
--- a/src/who.c
+++ b/src/who.c
@@ -468,7 +468,7 @@ Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n\
 	   program_name);
 
   if (status != 0)
-    fprintf (stderr, "\nTry `%s --help' for more information.\n",
+    fprintf (stderr, "Try `%s --help' for more information.\n",
 	     program_name);
   else