ncurses 5.9 - patch 20110507

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

diff --git a/ncurses/tinfo/captoinfo.c b/ncurses/tinfo/captoinfo.c
index e2c81308e2c1a3f2bbbb83b20c19880578b8a836..a0da44dea98938ed79abf6b3396810c595b860f6 100644 (file)
--- a/ncurses/tinfo/captoinfo.c
+++ b/ncurses/tinfo/captoinfo.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2009,2010 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            *
@@ -29,6 +29,7 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
 /*
@@ -92,7 +93,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: captoinfo.c,v 1.45 2003/11/08 21:28:04 tom Exp $")
+MODULE_ID("$Id: captoinfo.c,v 1.58 2010/12/04 20:08:19 tom Exp $")
 
 #define MAX_PUSHED     16      /* max # args we can push onto the stack */
 
@@ -124,10 +125,10 @@ init_string(void)
 static char *
 save_string(char *d, const char *const s)
 {
-    size_t have = (d - my_string);
+    size_t have = (size_t) (d - my_string);
     size_t need = have + strlen(s) + 2;
     if (need > my_length) {
-       my_string = (char *) realloc(my_string, my_length = (need + need));
+       my_string = (char *) _nc_doalloc(my_string, my_length = (need + need));
        if (my_string == 0)
            _nc_err_abort(MSG_NO_MEMORY);
        d = my_string + have;
@@ -136,7 +137,7 @@ save_string(char *d, const char *const s)
     return d + strlen(d);
 }
 
-static inline char *
+static NCURSES_INLINE char *
 save_char(char *s, int c)
 {
     static char temp[2];
@@ -148,7 +149,7 @@ static void
 push(void)
 /* push onstack on to the stack */
 {
-    if (stackptr > MAX_PUSHED)
+    if (stackptr >= MAX_PUSHED)
        _nc_warning("string too complex to convert");
     else
        stack[stackptr++] = onstack;
@@ -182,7 +183,7 @@ cvtchar(register const char *sp)
        case '$':
        case '\\':
        case '%':
-           c = *sp;
+           c = (unsigned char) (*sp);
            len = 2;
            break;
        case '\0':
@@ -195,22 +196,22 @@ cvtchar(register const char *sp)
        case '3':
            len = 1;
            while (isdigit(UChar(*sp))) {
-               c = 8 * c + (*sp++ - '0');
+               c = (unsigned char) (8 * c + (*sp++ - '0'));
                len++;
            }
            break;
        default:
-           c = *sp;
+           c = (unsigned char) (*sp);
            len = 2;
            break;
        }
        break;
     case '^':
-       c = (*++sp & 0x1f);
+       c = (unsigned char) (*++sp & 0x1f);
        len = 2;
        break;
     default:
-       c = *sp;
+       c = (unsigned char) (*sp);
        len = 1;
     }
     if (isgraph(c) && c != ',' && c != '\'' && c != '\\' && c != ':') {
@@ -276,7 +277,7 @@ getparm(int parm, int n)
  *     % translations if 1
  *     pad translations if >=0
  */
-char *
+NCURSES_EXPORT(char *)
 _nc_captoinfo(const char *cap, const char *s, int const parameterized)
 {
     const char *capstart;
@@ -636,12 +637,13 @@ save_tc_inequality(char *bufptr, int c1, int c2)
  * Convert a terminfo string to termcap format.  Parameters are as in
  * _nc_captoinfo().
  */
-char *
+NCURSES_EXPORT(char *)
 _nc_infotocap(const char *cap GCC_UNUSED, const char *str, int const parameterized)
 {
     int seenone = 0, seentwo = 0, saw_m = 0, saw_n = 0;
     const char *padding;
     const char *trimmed = 0;
+    int in0, in1, in2;
     char ch1 = 0, ch2 = 0;
     char *bufptr = init_string();
     int len;
@@ -665,8 +667,27 @@ _nc_infotocap(const char *cap GCC_UNUSED, const char *str, int const parameteriz
        int c1, c2;
        char *cp = 0;
 
-       if (str[0] == '\\' && (str[1] == '^' || str[1] == ',')) {
-           bufptr = save_char(bufptr, *++str);
+       if (str[0] == '^') {
+           if (str[1] == '\0' || (str + 1) == trimmed) {
+               bufptr = save_string(bufptr, "\\136");
+               ++str;
+           } else {
+               bufptr = save_char(bufptr, *str++);
+               bufptr = save_char(bufptr, *str);
+           }
+       } else if (str[0] == '\\') {
+           if (str[1] == '\0' || (str + 1) == trimmed) {
+               bufptr = save_string(bufptr, "\\134");
+               ++str;
+           } else if (str[1] == '^') {
+               bufptr = save_string(bufptr, "\\136");
+               ++str;
+           } else if (str[1] == ',') {
+               bufptr = save_char(bufptr, *++str);
+           } else {
+               bufptr = save_char(bufptr, *str++);
+               bufptr = save_char(bufptr, *str);
+           }
        } else if (str[0] == '$' && str[1] == '<') {    /* discard padding */
            str += 2;
            while (isdigit(UChar(*str))
@@ -676,8 +697,22 @@ _nc_infotocap(const char *cap GCC_UNUSED, const char *str, int const parameteriz
                   || *str == '>')
                str++;
            --str;
+       } else if (sscanf(str,
+                         "[%%?%%p1%%{8}%%<%%t%d%%p1%%d%%e%%p1%%{16}%%<%%t%d%%p1%%{8}%%-%%d%%e%d;5;%%p1%%d%%;m",
+                         &in0, &in1, &in2) == 3
+                  && ((in0 == 4 && in1 == 10 && in2 == 48)
+                      || (in0 == 3 && in1 == 9 && in2 == 38))) {
+           /* dumb-down an optimized case from xterm-256color for termcap */
+           str = strstr(str, ";m");
+           ++str;
+           if (in2 == 48) {
+               bufptr = save_string(bufptr, "[48;5;%dm");
+           } else {
+               bufptr = save_string(bufptr, "[38;5;%dm");
+           }
        } else if (str[0] == '%' && str[1] == '%') {    /* escaped '%' */
            bufptr = save_string(bufptr, "%%");
+           ++str;
        } else if (*str != '%' || (parameterized < 1)) {
            bufptr = save_char(bufptr, *str);
        } else if (sscanf(str, "%%?%%{%d}%%>%%t%%{%d}%%+%%;", &c1, &c2) == 2) {
@@ -786,6 +821,11 @@ _nc_infotocap(const char *cap GCC_UNUSED, const char *str, int const parameteriz
            }                   /* endswitch (*str) */
        }                       /* endelse (*str == '%') */
 
+       /*
+        * 'str' always points to the end of what was scanned in this step,
+        * but that may not be the end of the string.
+        */
+       assert(str != 0);
        if (*str == '\0')
            break;
 
@@ -833,4 +873,13 @@ main(int argc, char *argv[])
 }
 #endif /* MAIN */
 
-/* captoinfo.c ends here */
+#if NO_LEAKS
+NCURSES_EXPORT(void)
+_nc_captoinfo_leaks(void)
+{
+    if (my_string != 0) {
+       FreeAndNull(my_string);
+    }
+    my_length = 0;
+}
+#endif