diff options
| author | Jim Meyering <jim@meyering.net> | 1994-02-20 17:01:44 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1994-02-20 17:01:44 +0000 |
| commit | 31b899e2e1dbd263fe5ba4dbeb74b4d587897be0 (patch) | |
| tree | 235a4d14fc77e223f89a27c3ee0cce4f0985bfcf | |
| parent | 01b914a12e084e729e57e355e188485dbcfeb593 (diff) | |
| download | coreutils-31b899e2e1dbd263fe5ba4dbeb74b4d587897be0.tar.xz | |
merge with 1.9.4
| -rw-r--r-- | old/sh-utils/ChangeLog | 6 | ||||
| -rw-r--r-- | src/stty.c | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog index 4c29216d3..74108bf5b 100644 --- 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 1b9b9242d..3232a5bf9 100644 --- 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); } |