ncurses 5.0

[ncurses.git] / progs / tput.c

diff --git a/progs/tput.c b/progs/tput.c
index e14140eba7c268e13e36199a3ae3fd8b6ba41d47..7a859f1641118def2f3612c024771a3c1ec6fa64 100644 (file)
--- a/progs/tput.c
+++ b/progs/tput.c
@@ -40,10 +40,11 @@
  */
 
 #include <progs.priv.h>
+#ifndef        PURE_TERMINFO
+#include <termsort.c>
+#endif
 
-#include <curses.h>
-
-MODULE_ID("$Id: tput.c,v 1.11 1998/02/11 12:14:02 tom Exp $")
+MODULE_ID("$Id: tput.c,v 1.14 1999/07/31 21:18:29 Goran.Uddeborg Exp $")
 
 #define PUTS(s)                fputs(s, stdout)
 #define PUTCHAR(c)     putchar(c)
@@ -70,16 +71,18 @@ static void usage(void)
 
 static int tput(int argc, char *argv[])
 {
+char *name;
 char *s;
 int i, j, c;
 int reset, status;
 FILE *f;
 
        reset = 0;
-       if (strcmp(argv[0], "reset") == 0) {
+       name = argv[0];
+       if (strcmp(name, "reset") == 0) {
                reset = 1;
        }
-       if (reset || strcmp(argv[0], "init") == 0) {
+       if (reset || strcmp(name, "init") == 0) {
                if (init_prog != NULL) {
                        system(init_prog);
                }
@@ -91,14 +94,14 @@ FILE *f;
                        PUTS(init_1string);
                }
                FLUSH;
-       
+
                if (reset && reset_2string != NULL) {
                        PUTS(reset_2string);
                } else if (init_2string != NULL) {
                        PUTS(init_2string);
                }
                FLUSH;
-       
+
                if (set_lr_margin != NULL) {
                        PUTS(tparm(set_lr_margin, 0, columns - 1));
                } else if (set_left_margin_parm != NULL
@@ -129,14 +132,14 @@ FILE *f;
                        }
                }
                FLUSH;
-       
+
                if (init_tabs != 8) {
                        if (clear_all_tabs != NULL && set_tab != NULL) {
                                for(i = 0; i < columns - 1; i += 8) {
                                        if (parm_right_cursor) {
                                                PUTS(tparm(parm_right_cursor, 8));
                                        } else {
-                                               for(j = 0; j < 8; j++) 
+                                               for(j = 0; j < 8; j++)
                                                        PUTCHAR(' ');
                                        }
                                        PUTS(set_tab);
@@ -144,7 +147,7 @@ FILE *f;
                                FLUSH;
                        }
                }
-       
+
                if (reset && reset_file != NULL) {
                        f = fopen(reset_file, "r");
                        if (f == NULL) {
@@ -165,7 +168,7 @@ FILE *f;
                        fclose(f);
                }
                FLUSH;
-       
+
                if (reset && reset_3string != NULL) {
                        PUTS(reset_3string);
                } else if (init_2string != NULL) {
@@ -174,20 +177,45 @@ FILE *f;
                FLUSH;
                return 0;
        }
-       
-       if (strcmp(argv[0], "longname") == 0) {
+
+       if (strcmp(name, "longname") == 0) {
                PUTS(longname());
                return 0;
        }
 
-       if ((status = tigetflag(argv[0])) != -1)
+#ifndef        PURE_TERMINFO
+       {
+               const struct name_table_entry   *np;
+
+               if ((np = _nc_find_entry(name, _nc_get_hash_table(1))) != 0)
+                       switch(np->nte_type)
+                       {
+                       case BOOLEAN:
+                               if (bool_from_termcap[np->nte_index])
+                                       name = boolnames[np->nte_index];
+                               break;
+
+                       case NUMBER:
+                               if (num_from_termcap[np->nte_index])
+                                       name = numnames[np->nte_index];
+                               break;
+
+                       case STRING:
+                               if (str_from_termcap[np->nte_index])
+                                       name = strnames[np->nte_index];
+                               break;
+                       }
+       }
+#endif
+
+       if ((status = tigetflag(name)) != -1)
                return(status != 0);
-       else if ((status = tigetnum(argv[0])) != CANCELLED_NUMERIC) {
+       else if ((status = tigetnum(name)) != CANCELLED_NUMERIC) {
                (void) printf("%d\n", status);
                return(0);
        }
-       else if ((s = tigetstr(argv[0])) == CANCELLED_STRING)
-               quit(4, "%s: unknown terminfo capability '%s'", prg_name, argv[0]);
+       else if ((s = tigetstr(name)) == CANCELLED_STRING)
+               quit(4, "%s: unknown terminfo capability '%s'", prg_name, name);
        else if (s != (char *)NULL) {
                if (argc > 1) {
                int k;
@@ -255,7 +283,7 @@ int errors = 0;
        if (term == NULL || *term == '\0')
                quit(2, "No value for $TERM and no -T specified");
 
-       if (setupterm(term, STDOUT_FILENO, &errret) != OK)
+       if (setupterm(term, STDOUT_FILENO, &errret) != OK && errret <= 0) 
                quit(3, "unknown terminal \"%s\"", term);
 
        if (cmdline)