ncurses 5.9 - patch 20150418

[ncurses.git] / progs / tput.c

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

- * Copyright (c) 1998-2006,2007 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.40 2007/07/21 17:45:59 tom 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,6 +111,9 @@ tput(int argc, char *argv[])
     int i, j, c;
     int status;
     FILE *f;
     int i, j, c;
     int status;
     FILE *f;

+#if !PURE_TERMINFO
+    bool termcap = FALSE;
+#endif

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


@@ -263,40 +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) {
        if (argc > 1) {
            int k;
        quit(4, "unknown terminfo capability '%s'", name);
     } else if (s != ABSENT_STRING) {
        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];


@@ -327,8 +295,8 @@ tput(int argc, char *argv[])
                break;
            case Numbers:
            default:
                break;
            case Numbers:
            default:

-               (void) _nc_tparm_analyze(s, p_is_s, &popcount);
-#define myParam(n) (p_is_s[n - 1] != 0 ? ((long) strings[n]) : numbers[n])
+               (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),
                s = TPARM_9(s,
                            myParam(1),
                            myParam(2),