merge with 1.9.4

This commit is contained in:
Jim Meyering
1994-02-20 17:01:44 +00:00
parent 01b914a12e
commit 31b899e2e1
2 changed files with 10 additions and 3 deletions
+6
View File
@@ -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)
+4 -3
View File
@@ -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);
}