ncurses 6.1 - patch 20190914

[ncurses.git] / ncurses / tinfo / lib_tparm.c

diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c
index 806b21c181e4ce6ff456f0aa2deda31a389ddcf3..a98cfd86afbf0114911b007c7d72e2254d0fe769 100644 (file)
--- a/ncurses/tinfo/lib_tparm.c
+++ b/ncurses/tinfo/lib_tparm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2018,2019 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            *


@@ -42,7 +42,7 @@
 #include <ctype.h>
 #include <tic.h>
 
 #include <ctype.h>
 #include <tic.h>
 

-MODULE_ID("$Id: lib_tparm.c,v 1.77 2008/11/16 00:19:59 juergen Exp $")
+MODULE_ID("$Id: lib_tparm.c,v 1.107 2019/01/19 15:46:25 tom Exp $")

 
 /*
  *     char *
 
 /*
  *     char *


@@ -53,7 +53,7 @@ MODULE_ID("$Id: lib_tparm.c,v 1.77 2008/11/16 00:19:59 juergen Exp $")
  *
  *          Cursor addressing and other strings  requiring  parame-
  *     ters in the terminal are described by a parameterized string
  *
  *          Cursor addressing and other strings  requiring  parame-
  *     ters in the terminal are described by a parameterized string

- *     capability, with like escapes %x in  it.   For  example,  to
+ *     capability, with escapes like %x in  it.   For  example,  to

  *     address  the  cursor, the cup capability is given, using two
  *     parameters: the row and column to  address  to.   (Rows  and
  *     columns  are  numbered  from  zero and refer to the physical
  *     address  the  cursor, the cup capability is given, using two
  *     parameters: the row and column to  address  to.   (Rows  and
  *     columns  are  numbered  from  zero and refer to the physical


@@ -107,6 +107,7 @@ MODULE_ID("$Id: lib_tparm.c,v 1.77 2008/11/16 00:19:59 juergen Exp $")
 NCURSES_EXPORT_VAR(int) _nc_tparm_err = 0;
 
 #define TPS(var) _nc_prescreen.tparm_state.var
 NCURSES_EXPORT_VAR(int) _nc_tparm_err = 0;
 
 #define TPS(var) _nc_prescreen.tparm_state.var

+#define popcount _nc_popcount  /* workaround for NetBSD 6.0 defect */

 
 #if NO_LEAKS
 NCURSES_EXPORT(void)
 
 #if NO_LEAKS
 NCURSES_EXPORT(void)


@@ -128,9 +129,7 @@ get_space(size_t need)
     need += TPS(out_used);
     if (need > TPS(out_size)) {
        TPS(out_size) = need * 2;
     need += TPS(out_used);
     if (need > TPS(out_size)) {
        TPS(out_size) = need * 2;

-       TPS(out_buff) = typeRealloc(char, TPS(out_size), TPS(out_buff));
-       if (TPS(out_buff) == 0)
-           _nc_err_abort(MSG_NO_MEMORY);
+       TYPE_REALLOC(char, TPS(out_size), TPS(out_buff));

     }
 }
 
     }
 }
 


@@ -139,11 +138,13 @@ save_text(const char *fmt, const char *s, int len)
 {
     size_t s_len = strlen(s);
     if (len > (int) s_len)
 {
     size_t s_len = strlen(s);
     if (len > (int) s_len)

-       s_len = len;
+       s_len = (size_t) len;

 
     get_space(s_len + 1);
 
 
     get_space(s_len + 1);
 

-    (void) sprintf(TPS(out_buff) + TPS(out_used), fmt, s);
+    _nc_SPRINTF(TPS(out_buff) + TPS(out_used),
+               _nc_SLIMIT(TPS(out_size) - TPS(out_used))
+               fmt, s);

     TPS(out_used) += strlen(TPS(out_buff) + TPS(out_used));
 }
 
     TPS(out_used) += strlen(TPS(out_buff) + TPS(out_used));
 }
 


@@ -153,9 +154,11 @@ save_number(const char *fmt, int number, int len)
     if (len < 30)
        len = 30;               /* actually log10(MAX_INT)+1 */
 
     if (len < 30)
        len = 30;               /* actually log10(MAX_INT)+1 */
 

-    get_space((unsigned) len + 1);
+    get_space((size_t) len + 1);

 
 

-    (void) sprintf(TPS(out_buff) + TPS(out_used), fmt, number);
+    _nc_SPRINTF(TPS(out_buff) + TPS(out_used),
+               _nc_SLIMIT(TPS(out_size) - TPS(out_used))
+               fmt, number);

     TPS(out_used) += strlen(TPS(out_buff) + TPS(out_used));
 }
 
     TPS(out_used) += strlen(TPS(out_buff) + TPS(out_used));
 }
 


@@ -164,7 +167,7 @@ save_char(int c)
 {
     if (c == 0)
        c = 0200;
 {
     if (c == 0)
        c = 0200;

-    get_space(1);
+    get_space((size_t) 1);

     TPS(out_buff)[TPS(out_used)++] = (char) c;
 }
 
     TPS(out_buff)[TPS(out_used)++] = (char) c;
 }
 


@@ -250,6 +253,9 @@ parse_format(const char *s, char *format, int *len)
            case 'x':           /* FALLTHRU */
            case 'X':           /* FALLTHRU */
            case 's':
            case 'x':           /* FALLTHRU */
            case 'X':           /* FALLTHRU */
            case 's':

+#ifdef EXP_XTERM_1005
+           case 'u':
+#endif

                *format++ = *s;
                done = TRUE;
                break;
                *format++ = *s;
                done = TRUE;
                break;


@@ -320,6 +326,7 @@ parse_format(const char *s, char *format, int *len)
 
 #define isUPPER(c) ((c) >= 'A' && (c) <= 'Z')
 #define isLOWER(c) ((c) >= 'a' && (c) <= 'z')
 
 #define isUPPER(c) ((c) >= 'A' && (c) <= 'Z')
 #define isLOWER(c) ((c) >= 'a' && (c) <= 'z')

+#define tc_BUMP()  if (level < 0 && number < 2) number++

 
 /*
  * Analyze the string to see how many parameters we need from the varargs list,
 
 /*
  * Analyze the string to see how many parameters we need from the varargs list,


@@ -340,14 +347,15 @@ _nc_tparm_analyze(const char *string, char *p_is_s[NUM_PARM], int *popcount)
     int lastpop = -1;
     int len;
     int number = 0;
     int lastpop = -1;
     int len;
     int number = 0;

+    int level = -1;

     const char *cp = string;
     static char dummy[] = "";
 
     if (cp == 0)
        return 0;
 
     const char *cp = string;
     static char dummy[] = "";
 
     if (cp == 0)
        return 0;
 

-    if ((len2 = strlen(cp)) > TPS(fmt_size)) {
-       TPS(fmt_size) = len2 + TPS(fmt_size) + 2;
+    if ((len2 = strlen(cp)) + 2 > TPS(fmt_size)) {
+       TPS(fmt_size) += len2 + 2;

        TPS(fmt_buff) = typeRealloc(char, TPS(fmt_size), TPS(fmt_buff));
        if (TPS(fmt_buff) == 0)
            return 0;
        TPS(fmt_buff) = typeRealloc(char, TPS(fmt_size), TPS(fmt_buff));
        if (TPS(fmt_buff) == 0)
            return 0;


@@ -369,22 +377,30 @@ _nc_tparm_analyze(const char *string, char *p_is_s[NUM_PARM], int *popcount)
            case 'x':           /* FALLTHRU */
            case 'X':           /* FALLTHRU */
            case 'c':           /* FALLTHRU */
            case 'x':           /* FALLTHRU */
            case 'X':           /* FALLTHRU */
            case 'c':           /* FALLTHRU */

-               if (lastpop <= 0)
-                   number++;
+#ifdef EXP_XTERM_1005
+           case 'u':
+#endif
+               if (lastpop <= 0) {
+                   tc_BUMP();
+               }
+               level -= 1;

                lastpop = -1;
                break;
 
            case 'l':
            case 's':
                lastpop = -1;
                break;
 
            case 'l':
            case 's':

-               if (lastpop > 0)
+               if (lastpop > 0) {
+                   level -= 1;

                    p_is_s[lastpop - 1] = dummy;
                    p_is_s[lastpop - 1] = dummy;

-               ++number;
+               }
+               tc_BUMP();

                break;
 
            case 'p':
                cp++;
                i = (UChar(*cp) - '0');
                if (i >= 0 && i <= NUM_PARM) {
                break;
 
            case 'p':
                cp++;
                i = (UChar(*cp) - '0');
                if (i >= 0 && i <= NUM_PARM) {

+                   ++level;

                    lastpop = i;
                    if (lastpop > *popcount)
                        *popcount = lastpop;
                    lastpop = i;
                    if (lastpop > *popcount)
                        *popcount = lastpop;


@@ -392,20 +408,22 @@ _nc_tparm_analyze(const char *string, char *p_is_s[NUM_PARM], int *popcount)
                break;
 
            case 'P':
                break;
 
            case 'P':

-               ++number;

                ++cp;
                break;
 
            case 'g':
                ++cp;
                break;
 
            case 'g':

+               ++level;

                cp++;
                break;
 
            case S_QUOTE:
                cp++;
                break;
 
            case S_QUOTE:

+               ++level;

                cp += 2;
                lastpop = -1;
                break;
 
            case L_BRACE:
                cp += 2;
                lastpop = -1;
                break;
 
            case L_BRACE:

+               ++level;

                cp++;
                while (isdigit(UChar(*cp))) {
                    cp++;
                cp++;
                while (isdigit(UChar(*cp))) {
                    cp++;


@@ -425,14 +443,15 @@ _nc_tparm_analyze(const char *string, char *p_is_s[NUM_PARM], int *popcount)
            case '=':
            case '<':
            case '>':
            case '=':
            case '<':
            case '>':

+               tc_BUMP();
+               level -= 1;     /* pop 2, operate, push 1 */

                lastpop = -1;
                lastpop = -1;

-               number += 2;

                break;
 
            case '!':
            case '~':
                break;
 
            case '!':
            case '~':

+               tc_BUMP();

                lastpop = -1;
                lastpop = -1;

-               ++number;

                break;
 
            case 'i':
                break;
 
            case 'i':


@@ -450,21 +469,26 @@ _nc_tparm_analyze(const char *string, char *p_is_s[NUM_PARM], int *popcount)
 }
 
 static NCURSES_INLINE char *
 }
 
 static NCURSES_INLINE char *

-tparam_internal(const char *string, va_list ap)
+tparam_internal(int use_TPARM_ARG, const char *string, va_list ap)

 {
     char *p_is_s[NUM_PARM];
     TPARM_ARG param[NUM_PARM];
 {
     char *p_is_s[NUM_PARM];
     TPARM_ARG param[NUM_PARM];

-    int popcount;
+    int popcount = 0;

     int number;
     int number;

+    int num_args;

     int len;
     int level;
     int x, y;
     int i;
     const char *cp = string;
     size_t len2;
     int len;
     int level;
     int x, y;
     int i;
     const char *cp = string;
     size_t len2;

+    bool termcap_hack;
+    bool incremented_two;

 
 

-    if (cp == NULL)
+    if (cp == NULL) {
+       TR(TRACE_CALLS, ("%s: format is null", TPS(tname)));

        return NULL;
        return NULL;

+    }

 
     TPS(out_used) = 0;
     len2 = strlen(cp);
 
     TPS(out_used) = 0;
     len2 = strlen(cp);


@@ -475,10 +499,20 @@ tparam_internal(const char *string, va_list ap)
      * variable-length argument list.
      */
     number = _nc_tparm_analyze(cp, p_is_s, &popcount);
      * variable-length argument list.
      */
     number = _nc_tparm_analyze(cp, p_is_s, &popcount);

-    if (TPS(fmt_buff) == 0)
+    if (TPS(fmt_buff) == 0) {
+       TR(TRACE_CALLS, ("%s: error in analysis", TPS(tname)));

        return NULL;
        return NULL;

+    }
+
+    incremented_two = FALSE;
+
+    if (number > NUM_PARM)
+       number = NUM_PARM;
+    if (popcount > NUM_PARM)
+       popcount = NUM_PARM;
+    num_args = max(popcount, number);

 
 

-    for (i = 0; i < max(popcount, number); i++) {
+    for (i = 0; i < num_args; i++) {

        /*
         * A few caps (such as plab_norm) have string-valued parms.
         * We'll have to assume that the caller knows the difference, since
        /*
         * A few caps (such as plab_norm) have string-valued parms.
         * We'll have to assume that the caller knows the difference, since


@@ -488,8 +522,11 @@ tparam_internal(const char *string, va_list ap)
         */
        if (p_is_s[i] != 0) {
            p_is_s[i] = va_arg(ap, char *);
         */
        if (p_is_s[i] != 0) {
            p_is_s[i] = va_arg(ap, char *);

-       } else {
+           param[i] = 0;
+       } else if (use_TPARM_ARG) {

            param[i] = va_arg(ap, TPARM_ARG);
            param[i] = va_arg(ap, TPARM_ARG);

+       } else {
+           param[i] = (TPARM_ARG) va_arg(ap, int);

        }
     }
 
        }
     }
 


@@ -501,22 +538,29 @@ tparam_internal(const char *string, va_list ap)
      * style, which means tparam() will expand termcap strings OK.
      */
     TPS(stack_ptr) = 0;
      * style, which means tparam() will expand termcap strings OK.
      */
     TPS(stack_ptr) = 0;

+    termcap_hack = FALSE;

     if (popcount == 0) {
     if (popcount == 0) {

-       popcount = number;
+       termcap_hack = TRUE;

        for (i = number - 1; i >= 0; i--) {
            if (p_is_s[i])
                spush(p_is_s[i]);
            else
        for (i = number - 1; i >= 0; i--) {
            if (p_is_s[i])
                spush(p_is_s[i]);
            else

-               npush(param[i]);
+               npush((int) param[i]);

        }
     }
 #ifdef TRACE
     if (USE_TRACEF(TRACE_CALLS)) {
        }
     }
 #ifdef TRACE
     if (USE_TRACEF(TRACE_CALLS)) {

-       for (i = 0; i < popcount; i++) {
-           if (p_is_s[i] != 0)
+       for (i = 0; i < num_args; i++) {
+           if (p_is_s[i] != 0) {

                save_text(", %s", _nc_visbuf(p_is_s[i]), 0);
                save_text(", %s", _nc_visbuf(p_is_s[i]), 0);

-           else
-               save_number(", %d", param[i], 0);
+           } else if ((long) param[i] > MAX_OF_TYPE(NCURSES_INT2) ||
+                      (long) param[i] < 0) {
+               _tracef("BUG: problem with tparm parameter #%d of %d",
+                       i + 1, num_args);
+               break;
+           } else {
+               save_number(", %d", (int) param[i], 0);
+           }

        }
        _tracef(T_CALLED("%s(%s%s)"), TPS(tname), _nc_visbuf(cp), TPS(out_buff));
        TPS(out_used) = 0;
        }
        _tracef(T_CALLED("%s(%s%s)"), TPS(tname), _nc_visbuf(cp), TPS(out_buff));
        TPS(out_used) = 0;


@@ -548,8 +592,22 @@ tparam_internal(const char *string, va_list ap)
                save_char(npop());
                break;
 
                save_char(npop());
                break;
 

+#ifdef EXP_XTERM_1005
+           case 'u':
+               {
+                   unsigned char target[10];
+                   unsigned source = (unsigned) npop();
+                   int rc = _nc_conv_to_utf8(target, source, (unsigned)
+                                             sizeof(target));
+                   int n;
+                   for (n = 0; n < rc; ++n) {
+                       save_char(target[n]);
+                   }
+               }
+               break;
+#endif

            case 'l':
            case 'l':

-               save_number("%d", (int) strlen(spop()), 0);
+               npush((int) strlen(spop()));

                break;
 
            case 's':
                break;
 
            case 's':


@@ -560,10 +618,11 @@ tparam_internal(const char *string, va_list ap)
                cp++;
                i = (UChar(*cp) - '1');
                if (i >= 0 && i < NUM_PARM) {
                cp++;
                i = (UChar(*cp) - '1');
                if (i >= 0 && i < NUM_PARM) {

-                   if (p_is_s[i])
+                   if (p_is_s[i]) {

                        spush(p_is_s[i]);
                        spush(p_is_s[i]);

-                   else
-                       npush(param[i]);
+                   } else {
+                       npush((int) param[i]);
+                   }

                }
                break;
 
                }
                break;
 


@@ -632,11 +691,15 @@ tparam_internal(const char *string, va_list ap)
                break;
 
            case 'A':
                break;
 
            case 'A':

-               npush(npop() && npop());
+               y = npop();
+               x = npop();
+               npush(y && x);

                break;
 
            case 'O':
                break;
 
            case 'O':

-               npush(npop() || npop());
+               y = npop();
+               x = npop();
+               npush(y || x);

                break;
 
            case '&':
                break;
 
            case '&':


@@ -678,10 +741,26 @@ tparam_internal(const char *string, va_list ap)
                break;
 
            case 'i':
                break;
 
            case 'i':

-               if (p_is_s[0] == 0)
-                   param[0]++;
-               if (p_is_s[1] == 0)
-                   param[1]++;
+               /*
+                * Increment the first two parameters -- if they are numbers
+                * rather than strings.  As a side effect, assign into the
+                * stack; if this is termcap, then the stack was populated
+                * using the termcap hack above rather than via the terminfo
+                * 'p' case.
+                */
+               if (!incremented_two) {
+                   incremented_two = TRUE;
+                   if (p_is_s[0] == 0) {
+                       param[0]++;
+                       if (termcap_hack)
+                           TPS(stack)[0].data.num = (int) param[0];
+                   }
+                   if (p_is_s[1] == 0) {
+                       param[1]++;
+                       if (termcap_hack)
+                           TPS(stack)[1].data.num = (int) param[1];
+                   }
+               }

                break;
 
            case '?':
                break;
 
            case '?':


@@ -747,7 +826,7 @@ tparam_internal(const char *string, va_list ap)
        cp++;
     }                          /* endwhile (*cp) */
 
        cp++;
     }                          /* endwhile (*cp) */
 

-    get_space(1);
+    get_space((size_t) 1);

     TPS(out_buff)[TPS(out_used)] = '\0';
 
     T((T_RETURN("%s"), _nc_visbuf(TPS(out_buff))));
     TPS(out_buff)[TPS(out_used)] = '\0';
 
     T((T_RETURN("%s"), _nc_visbuf(TPS(out_buff))));


@@ -761,7 +840,7 @@ tparam_internal(const char *string, va_list ap)
 #endif
 
 NCURSES_EXPORT(char *)
 #endif
 
 NCURSES_EXPORT(char *)

-tparm_varargs(NCURSES_CONST char *string,...)
+tparm_varargs(const char *string, ...)

 {
     va_list ap;
     char *result;
 {
     va_list ap;
     char *result;


@@ -771,14 +850,14 @@ tparm_varargs(NCURSES_CONST char *string,...)
 #ifdef TRACE
     TPS(tname) = "tparm";
 #endif /* TRACE */
 #ifdef TRACE
     TPS(tname) = "tparm";
 #endif /* TRACE */

-    result = tparam_internal(string, ap);
+    result = tparam_internal(TRUE, string, ap);

     va_end(ap);
     return result;
 }
 
 #if !NCURSES_TPARM_VARARGS
 NCURSES_EXPORT(char *)
     va_end(ap);
     return result;
 }
 
 #if !NCURSES_TPARM_VARARGS
 NCURSES_EXPORT(char *)

-tparm_proto(NCURSES_CONST char *string,
+tparm_proto(const char *string,

            TPARM_ARG a1,
            TPARM_ARG a2,
            TPARM_ARG a3,
            TPARM_ARG a1,
            TPARM_ARG a2,
            TPARM_ARG a3,


@@ -792,3 +871,19 @@ tparm_proto(NCURSES_CONST char *string,
     return tparm_varargs(string, a1, a2, a3, a4, a5, a6, a7, a8, a9);
 }
 #endif /* NCURSES_TPARM_VARARGS */
     return tparm_varargs(string, a1, a2, a3, a4, a5, a6, a7, a8, a9);
 }
 #endif /* NCURSES_TPARM_VARARGS */

+
+NCURSES_EXPORT(char *)
+tiparm(const char *string, ...)
+{
+    va_list ap;
+    char *result;
+
+    _nc_tparm_err = 0;
+    va_start(ap, string);
+#ifdef TRACE
+    TPS(tname) = "tiparm";
+#endif /* TRACE */
+    result = tparam_internal(FALSE, string, ap);
+    va_end(ap);
+    return result;
+}