ncurses 6.2 - patch 20210925

[ncurses.git] / progs / tput.c

diff --git a/progs/tput.c b/progs/tput.c
index fe82d47235f5b3c0d103d4648f8f480ac487d772..ccc2f56d28c460473767b9e72f7dc0f18cbb5e49 100644 (file)
--- a/progs/tput.c
+++ b/progs/tput.c
@@ -47,7 +47,7 @@
 #include <transform.h>
 #include <tty_settings.h>
 
-MODULE_ID("$Id: tput.c,v 1.91 2021/08/21 00:24:45 tom Exp $")
+MODULE_ID("$Id: tput.c,v 1.94 2021/09/19 00:06:44 tom Exp $")
 
 #define PUTS(s)                fputs(s, stdout)
 
@@ -136,7 +136,7 @@ exit_code(int token, int value)
  * Returns nonzero on error.
  */
 static int
-tput_cmd(int fd, TTY * saved_settings, bool opt_x, int argc, char *argv[])
+tput_cmd(int fd, TTY * settings, bool opt_x, int argc, char **argv, int *used)
 {
     NCURSES_CONST char *name;
     char *s;
@@ -146,6 +146,7 @@ tput_cmd(int fd, TTY * saved_settings, bool opt_x, int argc, char *argv[])
 #endif
 
     name = check_aliases(argv[0], FALSE);
+    *used = 1;
     if (is_reset || is_init) {
        TTY oldmode;
 
@@ -155,7 +156,7 @@ tput_cmd(int fd, TTY * saved_settings, bool opt_x, int argc, char *argv[])
 
        if (is_reset) {
            reset_start(stdout, TRUE, FALSE);
-           reset_tty_settings(fd, saved_settings);
+           reset_tty_settings(fd, settings);
        } else {
            reset_start(stdout, FALSE, TRUE);
        }
@@ -165,13 +166,13 @@ tput_cmd(int fd, TTY * saved_settings, bool opt_x, int argc, char *argv[])
 #else
        (void) fd;
 #endif
-       set_control_chars(saved_settings, terasechar, intrchar, tkillchar);
-       set_conversions(saved_settings);
+       set_control_chars(settings, terasechar, intrchar, tkillchar);
+       set_conversions(settings);
        if (send_init_strings(fd, &oldmode)) {
            reset_flush();
        }
 
-       update_tty_settings(&oldmode, saved_settings);
+       update_tty_settings(&oldmode, settings);
        return 0;
     }
 
@@ -217,7 +218,8 @@ tput_cmd(int fd, TTY * saved_settings, bool opt_x, int argc, char *argv[])
     } else if (VALID_STRING(s)) {
        if (argc > 1) {
            int k;
-           int ignored;
+           int analyzed;
+           int popcount;
            long numbers[1 + NUM_PARM];
            char *strings[1 + NUM_PARM];
            char *p_is_s[NUM_PARM];
@@ -254,14 +256,19 @@ tput_cmd(int fd, TTY * saved_settings, bool opt_x, int argc, char *argv[])
            }
 #endif
 
+           popcount = 0;
+           _nc_reset_tparm(NULL);
            switch (paramType) {
            case Num_Str:
                s = TPARM_2(s, numbers[1], strings[2]);
+               analyzed = 2;
                break;
            case Num_Str_Str:
                s = TPARM_3(s, numbers[1], strings[2], strings[3]);
+               analyzed = 3;
                break;
            case Numbers:
+               analyzed = _nc_tparm_analyze(NULL, s, p_is_s, &popcount);
 #define myParam(n) numbers[n]
                s = TIPARM_9(s,
                             myParam(1),
@@ -278,7 +285,7 @@ tput_cmd(int fd, TTY * saved_settings, bool opt_x, int argc, char *argv[])
            case Other:
                /* FALLTHRU */
            default:
-               (void) _nc_tparm_analyze(NULL, s, p_is_s, &ignored);
+               analyzed = _nc_tparm_analyze(NULL, s, p_is_s, &popcount);
 #define myParam(n) (p_is_s[n - 1] != 0 ? ((TPARM_ARG) strings[n]) : numbers[n])
                s = TPARM_9(s,
                            myParam(1),
@@ -293,6 +300,10 @@ tput_cmd(int fd, TTY * saved_settings, bool opt_x, int argc, char *argv[])
 #undef myParam
                break;
            }
+           if (analyzed < popcount) {
+               analyzed = popcount;
+           }
+           *used += analyzed;
        }
 
        /* use putp() in order to perform padding */
@@ -312,6 +323,7 @@ main(int argc, char **argv)
     char buf[BUFSIZ];
     int result = 0;
     int fd;
+    int used;
     TTY tty_settings;
     bool opt_x = FALSE;                /* clear scrollback if possible */
     bool is_alias;
@@ -372,34 +384,53 @@ main(int argc, char **argv)
        quit(ErrTermType, "unknown terminal \"%s\"", term);
 
     if (cmdline) {
+       int code = 0;
        if ((argc <= 0) && !is_alias)
            usage();
-       ExitProgram(tput_cmd(fd, &tty_settings, opt_x, argc, argv));
+       while (argc > 0) {
+           code = tput_cmd(fd, &tty_settings, opt_x, argc, argv, &used);
+           if (code != 0)
+               break;
+           argc -= used;
+           argv += used;
+       }
+       ExitProgram(code);
     }
 
     while (fgets(buf, sizeof(buf), stdin) != 0) {
-       char *argvec[16];       /* command, 9 parms, null, & slop */
+       size_t need = strlen(buf);
+       char **argvec = typeCalloc(char *, need + 1);
+       char **argnow;
        int argnum = 0;
        char *cp;
 
-       /* crack the argument list into a dope vector */
+       if (argvec == NULL) {
+           quit(ErrSystem(1), strerror(errno));
+       }
+
+       /* split the buffer into tokens */
        for (cp = buf; *cp; cp++) {
            if (isspace(UChar(*cp))) {
                *cp = '\0';
-           } else if (cp == buf || cp[-1] == 0) {
+           } else if (cp == buf || cp[-1] == '\0') {
                argvec[argnum++] = cp;
-               if (argnum >= (int) SIZEOF(argvec) - 1)
+               if (argnum >= (int) need)
                    break;
            }
        }
-       argvec[argnum] = 0;
 
-       if (argnum != 0
-           && tput_cmd(fd, &tty_settings, opt_x, argnum, argvec) != 0) {
-           if (result == 0)
-               result = ErrSystem(0);  /* will return value >4 */
-           ++result;
+       argnow = argvec;
+       while (argnum > 0) {
+           int code = tput_cmd(fd, &tty_settings, opt_x, argnum, argnow, &used);
+           if (code != 0) {
+               if (result == 0)
+                   result = ErrSystem(0);      /* will return value >4 */
+               ++result;
+           }
+           argnum -= used;
+           argnow += used;
        }
+       free(argvec);
     }
 
     ExitProgram(result);