X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=ncurses%2Ftinfo%2Flib_tparm.c;h=bca90c8cbeb15dadcbbb5774cfa9d1a1d150e4e2;hb=bd0d93918c967f71d8e287fd6714f0b88da820da;hp=53205d1711bf06fb86c563edc4433e959ee9e995;hpb=03f728e5bb3630a54fffc4a2ff2f8dbfcce9088e;p=ncurses.git diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c index 53205d17..bca90c8c 100644 --- a/ncurses/tinfo/lib_tparm.c +++ b/ncurses/tinfo/lib_tparm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 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 * @@ -42,7 +42,7 @@ #include #include -MODULE_ID("$Id: lib_tparm.c,v 1.84 2011/10/22 15:48:47 tom Exp $") +MODULE_ID("$Id: lib_tparm.c,v 1.92 2014/05/23 00:33:45 tom Exp $") /* * char * @@ -53,7 +53,7 @@ MODULE_ID("$Id: lib_tparm.c,v 1.84 2011/10/22 15:48:47 tom Exp $") * * 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 @@ -107,6 +107,7 @@ MODULE_ID("$Id: lib_tparm.c,v 1.84 2011/10/22 15:48:47 tom Exp $") 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) @@ -128,9 +129,7 @@ get_space(size_t need) 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)); } } @@ -143,7 +142,9 @@ save_text(const char *fmt, const char *s, int len) 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)); } @@ -155,7 +156,9 @@ save_number(const char *fmt, int number, int len) 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)); } @@ -463,6 +466,8 @@ tparam_internal(int use_TPARM_ARG, const char *string, va_list ap) int i; const char *cp = string; size_t len2; + bool termcap_hack; + bool incremented_two; if (cp == NULL) return NULL; @@ -479,6 +484,8 @@ tparam_internal(int use_TPARM_ARG, const char *string, va_list ap) if (TPS(fmt_buff) == 0) return NULL; + incremented_two = FALSE; + if (number > NUM_PARM) number = NUM_PARM; if (popcount > NUM_PARM) @@ -511,7 +518,9 @@ tparam_internal(int use_TPARM_ARG, const char *string, va_list ap) * style, which means tparam() will expand termcap strings OK. */ TPS(stack_ptr) = 0; + termcap_hack = FALSE; if (popcount == 0) { + termcap_hack = TRUE; popcount = number; for (i = number - 1; i >= 0; i--) { if (p_is_s[i]) @@ -559,7 +568,7 @@ tparam_internal(int use_TPARM_ARG, const char *string, va_list ap) break; case 'l': - save_number("%d", (int) strlen(spop()), 0); + npush((int) strlen(spop())); break; case 's': @@ -570,10 +579,11 @@ tparam_internal(int use_TPARM_ARG, const char *string, va_list ap) 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]); - else + } else { npush((int) param[i]); + } } break; @@ -688,10 +698,26 @@ tparam_internal(int use_TPARM_ARG, const char *string, va_list ap) 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 '?':