Must distinguish between "ambiguous" and "unknown" commands.

[unix-history] / usr / src / usr.bin / window / tttermcap.c

diff --git a/usr/src/usr.bin/window/tttermcap.c b/usr/src/usr.bin/window/tttermcap.c
index 7570d32..481f19f 100644 (file)
--- a/usr/src/usr.bin/window/tttermcap.c
+++ b/usr/src/usr.bin/window/tttermcap.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)tttermcap.c        3.5 %G%";
+static char sccsid[] = "@(#)tttermcap.c        3.7 %G%";

 #endif
 
 /*
 #endif
 
 /*


@@ -11,6 +11,8 @@ static char sccsid[] = "@(#)tttermcap.c       3.5 %G%";
 #include "tt.h"
 
 char *tgetstr();
 #include "tt.h"
 
 char *tgetstr();

+char *tgoto();
+char *malloc();

 
 tttputc(c)
 {
 
 tttputc(c)
 {


@@ -22,18 +24,57 @@ ttxputc(c)
        *tt_strp++ = c;
 }
 
        *tt_strp++ = c;
 }
 

-char *
+struct tt_str *
+tttgetstr(str)
+       char *str;
+{
+       register struct tt_str *s;
+
+       if ((str = tgetstr(str, &tt_strp)) == 0)
+               return 0;
+       if ((s = (struct tt_str *) malloc(sizeof *s)) == 0)
+               return 0;
+       s->ts_str = str;
+       s->ts_n = tt_strp - s->ts_str - 1;
+       return s;
+}
+
+struct tt_str *

 ttxgetstr(str)
 ttxgetstr(str)

-char *str;
+       char *str;

 {
 {

+       register struct tt_str *s;

        char buf[100];
        char *bufp = buf;
 
        char buf[100];
        char *bufp = buf;
 

-       str = tgetstr(str, &bufp);
-       if (str == 0)
+       if (tgetstr(str, &bufp) == 0)

                return 0;
                return 0;

-       str = tt_strp;
+       if ((s = (struct tt_str *) malloc(sizeof *s)) == 0)
+               return 0;
+       s->ts_str = tt_strp;

        tputs(buf, 1, ttxputc);
        tputs(buf, 1, ttxputc);

-       ttxputc(0);
-       return str;
+       s->ts_n = tt_strp - s->ts_str;
+       *tt_strp++ = 0;
+       return s;
+}
+
+tttgoto(s, col, row)
+       struct tt_str *s;
+{
+       register char *p = s->ts_str;
+
+       ttputs(tgoto(p, col, row));
+       for (p += s->ts_n; *--p == 0;)
+               ttputc(0);
+}
+
+ttstrcmp(a, b)
+       register struct tt_str *a, *b;
+{
+       int n, r;
+
+       if (r = bcmp(a->ts_str, b->ts_str,
+                       (n = a->ts_n - b->ts_n) < 0 ? a->ts_n : b->ts_n))
+               return r;
+       return n;

 }
 }