merge with 1.9.4

diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index 4c29216d31ba8a3896b0cc78e3acc1ed9106d256..74108bf5bd6feeec0e25a60a06208df9983b5fc3 100644 (file)
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -1,5 +1,11 @@
 Sat Feb 19 14:23:14 1994  Jim Meyering  (meyering@comco.com)
 
+       * Version 1.9.4.
+
+       * stty.c (main): Use getopt_long_only with "ag" instead of
+       getopt_long with "".  The latter incremented optind so the
+       -a and -g options weren't recognized.
+
        * Version 1.9.3.
 
 Tue Feb 15 18:28:28 1994  Jim Meyering  (meyering@comco.com)

diff --git a/src/stty.c b/src/stty.c
index 1b9b9242d3aade4d185575dc5b8db5a7d155e8b0..3232a5bf9ece2ff0b5cce73cfa11f81e86927094 100644 (file)
--- a/src/stty.c
+++ b/src/stty.c
@@ -647,7 +647,8 @@ main (argc, argv)
 
   /* Recognize the long options only.  */
   opterr = 0;
-  while ((optc = getopt_long (argc, argv, "", longopts, (int *) 0)) != EOF)
+  while ((optc = getopt_long_only (argc, argv, "ag", longopts, (int *) 0))
+        != EOF)
     {
       switch (optc)
        {
@@ -717,8 +718,8 @@ main (argc, argv)
 
   if (verbose_output || recoverable_output || argc == 1)
     {
-  max_col = screen_columns ();
-  current_col = 0;
+      max_col = screen_columns ();
+      current_col = 0;
       display_settings (output_type, &mode);
       exit (0);
     }