ncurses 6.2 - patch 20200531

[ncurses.git] / progs / tput.c

diff --git a/progs/tput.c b/progs/tput.c
index 295b83fb8161513a83697cf0ee9da2ff8c135af2..4bb771478d255964d7cd46d743c5224f1649d5ee 100644 (file)
--- a/progs/tput.c
+++ b/progs/tput.c
@@ -51,7 +51,7 @@
 #include <transform.h>
 #include <tty_settings.h>
 
 #include <transform.h>
 #include <tty_settings.h>
 

-MODULE_ID("$Id: tput.c,v 1.81 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: tput.c,v 1.83 2020/05/27 23:47:51 tom Exp $")

 
 #define PUTS(s)                fputs(s, stdout)
 
 
 #define PUTS(s)                fputs(s, stdout)
 


@@ -63,7 +63,7 @@ static bool is_reset = FALSE;
 static bool is_clear = FALSE;
 
 static void
 static bool is_clear = FALSE;
 
 static void

-quit(int status, const char *fmt,...)
+quit(int status, const char *fmt, ...)

 {
     va_list argp;
 
 {
     va_list argp;
 


@@ -251,6 +251,19 @@ tput_cmd(int fd, TTY * saved_settings, bool opt_x, int argc, char *argv[])
                s = TPARM_3(s, numbers[1], strings[2], strings[3]);
                break;
            case Numbers:
                s = TPARM_3(s, numbers[1], strings[2], strings[3]);
                break;
            case Numbers:

+#define myParam(n) numbers[n]
+               s = TIPARM_9(s,
+                            myParam(1),
+                            myParam(2),
+                            myParam(3),
+                            myParam(4),
+                            myParam(5),
+                            myParam(6),
+                            myParam(7),
+                            myParam(8),
+                            myParam(9));
+#undef myParam
+               break;

            default:
                (void) _nc_tparm_analyze(s, p_is_s, &ignored);
 #define myParam(n) (p_is_s[n - 1] != 0 ? ((TPARM_ARG) strings[n]) : numbers[n])
            default:
                (void) _nc_tparm_analyze(s, p_is_s, &ignored);
 #define myParam(n) (p_is_s[n - 1] != 0 ? ((TPARM_ARG) strings[n]) : numbers[n])


@@ -264,6 +277,7 @@ tput_cmd(int fd, TTY * saved_settings, bool opt_x, int argc, char *argv[])
                            myParam(7),
                            myParam(8),
                            myParam(9));
                            myParam(7),
                            myParam(8),
                            myParam(9));

+#undef myParam

                break;
            }
        }
                break;
            }
        }