use "min" and "time", not "vmin" and "vtime"

From: Charles Hannum <mycroft@sun-lamp.cs.berkeley.edu>

SCCS-vsn: bin/stty/cchar.c 8.3
SCCS-vsn: bin/stty/gfmt.c 8.3

diff --git a/usr/src/bin/stty/cchar.c b/usr/src/bin/stty/cchar.c
index 39c8022..638ff95 100644 (file)
--- a/usr/src/bin/stty/cchar.c
+++ b/usr/src/bin/stty/cchar.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)cchar.c    8.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)cchar.c    8.3 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -37,14 +37,14 @@ struct cchar cchars1[] = {
        { "intr",       VINTR,          CINTR },
        { "kill",       VKILL,          CKILL },
        { "lnext",      VLNEXT,         CLNEXT },
        { "intr",       VINTR,          CINTR },
        { "kill",       VKILL,          CKILL },
        { "lnext",      VLNEXT,         CLNEXT },

+       { "min",        VMIN,           CMIN },

        { "quit",       VQUIT,          CQUIT },
        { "reprint",    VREPRINT,       CREPRINT },
        { "start",      VSTART,         CSTART },
        { "status",     VSTATUS,        CSTATUS },
        { "stop",       VSTOP,          CSTOP },
        { "susp",       VSUSP,          CSUSP },
        { "quit",       VQUIT,          CQUIT },
        { "reprint",    VREPRINT,       CREPRINT },
        { "start",      VSTART,         CSTART },
        { "status",     VSTATUS,        CSTATUS },
        { "stop",       VSTOP,          CSTOP },
        { "susp",       VSUSP,          CSUSP },

-       { "vmin",       VMIN,           CMIN },
-       { "vtime",      VTIME,          CTIME },
+       { "time",       VTIME,          CTIME },

        { "werase",     VWERASE,        CWERASE },
        { NULL },
 };
        { "werase",     VWERASE,        CWERASE },
        { NULL },
 };

diff --git a/usr/src/bin/stty/gfmt.c b/usr/src/bin/stty/gfmt.c
index dea469c..665afba 100644 (file)
--- a/usr/src/bin/stty/gfmt.c
+++ b/usr/src/bin/stty/gfmt.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)gfmt.c     8.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)gfmt.c     8.3 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -107,6 +107,11 @@ gread(tp, s)
                        tp->c_cc[VLNEXT] = tmp;
                        continue;
                }
                        tp->c_cc[VLNEXT] = tmp;
                        continue;
                }

+               if (CHK("min")) {
+                       (void)sscanf(ep, "%ld", &tmp);
+                       tp->c_cc[VMIN] = tmp;
+                       continue;
+               }

                if (CHK("oflag")) {
                        tp->c_oflag = tmp;
                        continue;
                if (CHK("oflag")) {
                        tp->c_oflag = tmp;
                        continue;


@@ -140,12 +145,7 @@ gread(tp, s)
                        tp->c_cc[VSUSP] = tmp;
                        continue;
                }
                        tp->c_cc[VSUSP] = tmp;
                        continue;
                }

-               if (CHK("vmin")) {
-                       (void)sscanf(ep, "%ld", &tmp);
-                       tp->c_cc[VMIN] = tmp;
-                       continue;
-               }
-               if (CHK("vtime")) {
+               if (CHK("time")) {

                        (void)sscanf(ep, "%ld", &tmp);
                        tp->c_cc[VTIME] = tmp;
                        continue;
                        (void)sscanf(ep, "%ld", &tmp);
                        tp->c_cc[VTIME] = tmp;
                        continue;