ncurses 5.9 - patch 20110730

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

diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c
index 44f410e7fb00e8f47b7e586c8a3106ecbd39d03d..b1d79248d0fdbfb03914a1ffb3fb0d00893633be 100644 (file)
--- a/ncurses/tinfo/lib_tparm.c
+++ b/ncurses/tinfo/lib_tparm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2011 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.80 2010/12/25 23:01:29 tom Exp $")
+MODULE_ID("$Id: lib_tparm.c,v 1.83 2011/05/21 18:11:56 tom Exp $")

 
 /*
  *     char *
 
 /*
  *     char *


@@ -454,8 +454,9 @@ tparam_internal(bool 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 len;
     int level;
     int x, y;


@@ -478,7 +479,13 @@ tparam_internal(bool use_TPARM_ARG, const char *string, va_list ap)
     if (TPS(fmt_buff) == 0)
        return NULL;
 
     if (TPS(fmt_buff) == 0)
        return NULL;
 

-    for (i = 0; i < max(popcount, number); i++) {
+    if (number > NUM_PARM)
+       number = NUM_PARM;
+    if (popcount > NUM_PARM)
+       popcount = NUM_PARM;
+    num_args = max(popcount, number);
+
+    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,6 +495,7 @@ tparam_internal(bool use_TPARM_ARG, 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 *);

+           param[i] = 0;

        } else if (use_TPARM_ARG) {
            param[i] = va_arg(ap, TPARM_ARG);
        } else {
        } else if (use_TPARM_ARG) {
            param[i] = va_arg(ap, TPARM_ARG);
        } else {


@@ -514,7 +522,7 @@ tparam_internal(bool use_TPARM_ARG, const char *string, va_list ap)
     }
 #ifdef TRACE
     if (USE_TRACEF(TRACE_CALLS)) {
     }
 #ifdef TRACE
     if (USE_TRACEF(TRACE_CALLS)) {

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

            if (p_is_s[i] != 0)
                save_text(", %s", _nc_visbuf(p_is_s[i]), 0);
            else
            if (p_is_s[i] != 0)
                save_text(", %s", _nc_visbuf(p_is_s[i]), 0);
            else