ncurses 5.9 - patch 20141220

[ncurses.git] / progs / tput.c

diff --git a/progs/tput.c b/progs/tput.c
index 70b762f7eb3f6c22e6bcc71c5b29fd73120327de..5069a5c31e4fc510ef193ddf9597d273e349ea07 100644 (file)
--- a/progs/tput.c
+++ b/progs/tput.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -29,6 +29,7 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *

+ *     and: Thomas E. Dickey                        1996-on                 *

  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*


@@ -38,25 +39,20 @@
  * Ross Ridge's mytinfo package.
  */
 
  * Ross Ridge's mytinfo package.
  */
 

-#include <progs.priv.h>
+#include <tparm_type.h>

 
 #if !PURE_TERMINFO
 
 #if !PURE_TERMINFO

+#include <dump_entry.h>

 #include <termsort.c>
 #endif
 #include <transform.h>
 
 #include <termsort.c>
 #endif
 #include <transform.h>
 

-MODULE_ID("$Id: tput.c,v 1.34 2004/01/16 23:23:11 Daniel.Jacobowitz Exp $")
+MODULE_ID("$Id: tput.c,v 1.50 2014/05/21 16:57:16 tom Exp $")

 
 #define PUTS(s)                fputs(s, stdout)
 #define PUTCHAR(c)     putchar(c)
 #define FLUSH          fflush(stdout)
 
 
 #define PUTS(s)                fputs(s, stdout)
 #define PUTCHAR(c)     putchar(c)
 #define FLUSH          fflush(stdout)
 

-typedef enum {
-    Numbers = 0
-    ,Num_Str
-    ,Num_Str_Str
-} TParams;
-

 static char *prg_name;
 static bool is_init = FALSE;
 static bool is_reset = FALSE;
 static char *prg_name;
 static bool is_init = FALSE;
 static bool is_reset = FALSE;


@@ -84,44 +80,8 @@ usage(void)
 static void
 check_aliases(const char *name)
 {
 static void
 check_aliases(const char *name)
 {

-    is_init = (strcmp(name, PROG_INIT) == 0);
-    is_reset = (strcmp(name, PROG_RESET) == 0);
-}
-
-/*
- * Lookup the type of call we should make to tparm().  This ignores the actual
- * terminfo capability (bad, because it is not extensible), but makes this
- * code portable to platforms where sizeof(int) != sizeof(char *).
- *
- * FIXME: If we want extensibility, analyze the capability string as we do
- * in tparm() to decide how to parse the varargs list.
- */
-static TParams
-tparm_type(const char *name)
-{
-#define TD(code, longname, ti, tc) {code,longname},{code,ti},{code,tc}
-    TParams result = Numbers;
-    /* *INDENT-OFF* */
-    static const struct {
-       TParams code;
-       const char *name;
-    } table[] = {
-       TD(Num_Str,     "pkey_key",     "pfkey",        "pk"),
-       TD(Num_Str,     "pkey_local",   "pfloc",        "pl"),
-       TD(Num_Str,     "pkey_xmit",    "pfx",          "px"),
-       TD(Num_Str,     "plab_norm",    "pln",          "pn"),
-       TD(Num_Str_Str, "pkey_plab",    "pfxl",         "xl"),
-    };
-    /* *INDENT-ON* */
-
-    unsigned n;
-    for (n = 0; n < SIZEOF(table); n++) {
-       if (!strcmp(name, table[n].name)) {
-           result = table[n].code;
-           break;
-       }
-    }
-    return result;
+    is_init = same_program(name, PROG_INIT);
+    is_reset = same_program(name, PROG_RESET);

 }
 
 static int
 }
 
 static int


@@ -151,7 +111,9 @@ tput(int argc, char *argv[])
     int i, j, c;
     int status;
     FILE *f;
     int i, j, c;
     int status;
     FILE *f;

-    int token = UNDEF;
+#if !PURE_TERMINFO
+    bool termcap = FALSE;
+#endif

 
     if ((name = argv[0]) == 0)
        name = "";
 
     if ((name = argv[0]) == 0)
        name = "";


@@ -178,14 +140,14 @@ tput(int argc, char *argv[])
 
 #ifdef set_lr_margin
        if (set_lr_margin != 0) {
 
 #ifdef set_lr_margin
        if (set_lr_margin != 0) {

-           PUTS(tparm(set_lr_margin, 0, columns - 1));
+           PUTS(TPARM_2(set_lr_margin, 0, columns - 1));

        } else
 #endif
 #ifdef set_left_margin_parm
            if (set_left_margin_parm != 0
                && set_right_margin_parm != 0) {
        } else
 #endif
 #ifdef set_left_margin_parm
            if (set_left_margin_parm != 0
                && set_right_margin_parm != 0) {

-           PUTS(tparm(set_left_margin_parm, 0));
-           PUTS(tparm(set_right_margin_parm, columns - 1));
+           PUTS(TPARM_1(set_left_margin_parm, 0));
+           PUTS(TPARM_1(set_right_margin_parm, columns - 1));

        } else
 #endif
            if (clear_margins != 0
        } else
 #endif
            if (clear_margins != 0


@@ -199,7 +161,7 @@ tput(int argc, char *argv[])
            }
            PUTS(set_left_margin);
            if (parm_right_cursor) {
            }
            PUTS(set_left_margin);
            if (parm_right_cursor) {

-               PUTS(tparm(parm_right_cursor, columns - 1));
+               PUTS(TPARM_1(parm_right_cursor, columns - 1));

            } else {
                for (i = 0; i < columns - 1; i++) {
                    PUTCHAR(' ');
            } else {
                for (i = 0; i < columns - 1; i++) {
                    PUTCHAR(' ');


@@ -218,7 +180,7 @@ tput(int argc, char *argv[])
            if (clear_all_tabs != 0 && set_tab != 0) {
                for (i = 0; i < columns - 1; i += 8) {
                    if (parm_right_cursor) {
            if (clear_all_tabs != 0 && set_tab != 0) {
                for (i = 0; i < columns - 1; i += 8) {
                    if (parm_right_cursor) {

-                       PUTS(tparm(parm_right_cursor, 8));
+                       PUTS(TPARM_1(parm_right_cursor, 8));

                    } else {
                        for (j = 0; j < 8; j++)
                            PUTCHAR(' ');
                    } else {
                        for (j = 0; j < 8; j++)
                            PUTCHAR(' ');


@@ -252,8 +214,8 @@ tput(int argc, char *argv[])
 
        if (is_reset && reset_3string != 0) {
            PUTS(reset_3string);
 
        if (is_reset && reset_3string != 0) {
            PUTS(reset_3string);

-       } else if (init_2string != 0) {
-           PUTS(init_2string);
+       } else if (init_3string != 0) {
+           PUTS(init_3string);

        }
        FLUSH;
        return 0;
        }
        FLUSH;
        return 0;


@@ -264,41 +226,45 @@ tput(int argc, char *argv[])
        return 0;
     }
 #if !PURE_TERMINFO
        return 0;
     }
 #if !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;
-           }
-    }
+  retry:

 #endif
 #endif

-

     if ((status = tigetflag(name)) != -1) {
        return exit_code(BOOLEAN, status);
     } else if ((status = tigetnum(name)) != CANCELLED_NUMERIC) {
        (void) printf("%d\n", status);
        return exit_code(NUMBER, 0);
     } else if ((s = tigetstr(name)) == CANCELLED_STRING) {
     if ((status = tigetflag(name)) != -1) {
        return exit_code(BOOLEAN, status);
     } else if ((status = tigetnum(name)) != CANCELLED_NUMERIC) {
        (void) printf("%d\n", status);
        return exit_code(NUMBER, 0);
     } else if ((s = tigetstr(name)) == CANCELLED_STRING) {

+#if !PURE_TERMINFO
+       if (!termcap) {
+           const struct name_table_entry *np;
+
+           termcap = TRUE;
+           if ((np = _nc_find_entry(name, _nc_get_hash_table(termcap))) != 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;
+               }
+               goto retry;
+           }
+       }
+#endif

        quit(4, "unknown terminfo capability '%s'", name);
     } else if (s != ABSENT_STRING) {
        quit(4, "unknown terminfo capability '%s'", name);
     } else if (s != ABSENT_STRING) {

-       token = STRING;

        if (argc > 1) {
            int k;
        if (argc > 1) {
            int k;

-           int popcount;
+           int ignored;

            long numbers[1 + NUM_PARM];
            char *strings[1 + NUM_PARM];
            char *p_is_s[NUM_PARM];
            long numbers[1 + NUM_PARM];
            char *strings[1 + NUM_PARM];
            char *p_is_s[NUM_PARM];


@@ -322,24 +288,25 @@ tput(int argc, char *argv[])
 
            switch (tparm_type(name)) {
            case Num_Str:
 
            switch (tparm_type(name)) {
            case Num_Str:

-               s = tparm(s, numbers[1], strings[2]);
+               s = TPARM_2(s, numbers[1], strings[2]);

                break;
            case Num_Str_Str:
                break;
            case Num_Str_Str:

-               s = tparm(s, numbers[1], strings[2], strings[3]);
+               s = TPARM_3(s, numbers[1], strings[2], strings[3]);

                break;
                break;

+           case Numbers:

            default:
            default:

-               (void) _nc_tparm_analyze(s, p_is_s, &popcount);
-#define myParam(n) (p_is_s[n - 1] != 0 ? ((long) strings[n]) : numbers[n])
-               s = tparm(s,
-                         myParam(1),
-                         myParam(2),
-                         myParam(3),
-                         myParam(4),
-                         myParam(5),
-                         myParam(6),
-                         myParam(7),
-                         myParam(8),
-                         myParam(9));
+               (void) _nc_tparm_analyze(s, p_is_s, &ignored);
+#define myParam(n) (p_is_s[n - 1] != 0 ? ((TPARM_ARG) strings[n]) : numbers[n])
+               s = TPARM_9(s,
+                           myParam(1),
+                           myParam(2),
+                           myParam(3),
+                           myParam(4),
+                           myParam(5),
+                           myParam(6),
+                           myParam(7),
+                           myParam(8),
+                           myParam(9));

                break;
            }
        }
                break;
            }
        }


@@ -360,13 +327,12 @@ main(int argc, char **argv)
     int c;
     char buf[BUFSIZ];
     int result = 0;
     int c;
     char buf[BUFSIZ];
     int result = 0;

-    int err;

 
     check_aliases(prg_name = _nc_rootname(argv[0]));
 
     term = getenv("TERM");
 
 
     check_aliases(prg_name = _nc_rootname(argv[0]));
 
     term = getenv("TERM");
 

-    while ((c = getopt(argc, argv, "ST:V")) != EOF) {
+    while ((c = getopt(argc, argv, "ST:V")) != -1) {

        switch (c) {
        case 'S':
            cmdline = FALSE;
        switch (c) {
        case 'S':
            cmdline = FALSE;


@@ -377,7 +343,7 @@ main(int argc, char **argv)
            break;
        case 'V':
            puts(curses_version());
            break;
        case 'V':
            puts(curses_version());

-           return EXIT_SUCCESS;
+           ExitProgram(EXIT_SUCCESS);

        default:
            usage();
            /* NOTREACHED */
        default:
            usage();
            /* NOTREACHED */


@@ -407,7 +373,7 @@ main(int argc, char **argv)
     if (cmdline) {
        if ((argc <= 0) && !is_reset && !is_init)
            usage();
     if (cmdline) {
        if ((argc <= 0) && !is_reset && !is_init)
            usage();

-       return tput(argc, argv);
+       ExitProgram(tput(argc, argv));

     }
 
     while (fgets(buf, sizeof(buf), stdin) != 0) {
     }
 
     while (fgets(buf, sizeof(buf), stdin) != 0) {


@@ -428,12 +394,12 @@ main(int argc, char **argv)
        argvec[argnum] = 0;
 
        if (argnum != 0
        argvec[argnum] = 0;
 
        if (argnum != 0

-           && (err = tput(argnum, argvec)) != 0) {
+           && tput(argnum, argvec) != 0) {

            if (result == 0)
                result = 4;     /* will return value >4 */
            ++result;
        }
     }
 
            if (result == 0)
                result = 4;     /* will return value >4 */
            ++result;
        }
     }
 

-    return result;
+    ExitProgram(result);

 }
 }