ncurses 5.6 - patch 20070421

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

diff --git a/ncurses/tinfo/comp_expand.c b/ncurses/tinfo/comp_expand.c
index eb552fadabda0d524ad94d4c949b3ff1ed8c515e..ef419d84cd2c66680449636a14b598efcb563261 100644 (file)
--- a/ncurses/tinfo/comp_expand.c
+++ b/ncurses/tinfo/comp_expand.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2001,2006 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            *


@@ -35,155 +35,158 @@
 #include <ctype.h>
 #include <tic.h>
 
 #include <ctype.h>
 #include <tic.h>
 

-MODULE_ID("$Id: comp_expand.c,v 1.11 1999/03/07 00:51:07 tom Exp $")
+MODULE_ID("$Id: comp_expand.c,v 1.18 2006/06/17 19:37:14 tom Exp $")

 
 

-static int trailing_spaces(const char *src)
+static int
+trailing_spaces(const char *src)

 {
 {

-       while (*src == ' ')
-               src++;
-       return *src == 0;
+    while (*src == ' ')
+       src++;
+    return *src == 0;

 }
 
 /* this deals with differences over whether 0x7f and 0x80..0x9f are controls */
 }
 
 /* this deals with differences over whether 0x7f and 0x80..0x9f are controls */

-#define CHAR_OF(s) (*(unsigned const char *)(s))
-#define REALCTL(s) (CHAR_OF(s) < 127 && iscntrl(CHAR_OF(s)))
-#define REALPRINT(s) (CHAR_OF(s) < 127 && isprint(CHAR_OF(s)))
+#define REALCTL(s) (UChar(*(s)) < 127 && iscntrl(UChar(*(s))))
+#define REALPRINT(s) (UChar(*(s)) < 127 && isprint(UChar(*(s))))

 
 

-char *_nc_tic_expand(const char *srcp, bool tic_format, int numbers)
+NCURSES_EXPORT(char *)
+_nc_tic_expand(const char *srcp, bool tic_format, int numbers)

 {
 {

-static char *  buffer;
-static size_t  length;
+    static char *buffer;
+    static size_t length;

 
 

-int            bufp;
-const char     *ptr, *str = VALID_STRING(srcp) ? srcp : "";
-bool           islong = (strlen(str) > 3);
-size_t         need = (2 + strlen(str)) * 4;
-int            ch;
+    int bufp;
+    const char *str = VALID_STRING(srcp) ? srcp : "";
+    bool islong = (strlen(str) > 3);
+    size_t need = (2 + strlen(str)) * 4;
+    int ch;

 
 

-       if (buffer == 0 || need > length) {
-               if ((buffer = typeRealloc(char, length = need, buffer)) == 0)
-                       return 0;
+#if NO_LEAKS
+    if (srcp == 0) {
+       if (buffer != 0) {
+           FreeAndNull(buffer);
+           length = 0;

        }
        }

+       return 0;
+    }
+#endif
+    if (buffer == 0 || need > length) {
+       if ((buffer = typeRealloc(char, length = need, buffer)) == 0)
+             return 0;
+    }

 
 

-       bufp = 0;
-       ptr = str;
-       while ((ch = (*str & 0xff)) != 0) {
-               if (ch == '%' && REALPRINT(str+1)) {
-                       buffer[bufp++] = *str++;
-                       /*
-                        * Though the character literals are more compact, most
-                        * terminal descriptions use numbers and are not easy
-                        * to read in character-literal form.
-                        */
-                       switch (numbers) {
-                       case -1:
-                           if (str[0] == S_QUOTE
-                            && str[1] != '\\'
-                            && REALPRINT(str+1)
-                            && str[2] == S_QUOTE) {
-                               sprintf(buffer+bufp, "{%d}", str[1]);
-                               bufp += strlen(buffer+bufp);
-                               str += 2;
-                           } else {
-                               buffer[bufp++] = *str;
-                           }
-                           break;
-                       /*
-                        * If we have a "%{number}", try to translate it into
-                        * a "%'char'" form, since that will run a little faster
-                        * when we're interpreting it.  Also, having one form
-                        * for the constant makes it simpler to compare terminal
-                        * descriptions.
-                        */
-                       case 1:
-                           if (str[0] == L_BRACE
-                            && isdigit(str[1])) {
-                               char *dst = 0;
-                               long value = strtol(str+1, &dst, 0);
-                               if (dst != 0
-                                && *dst == R_BRACE
-                                && value < 127
-                                && value != '\\'       /* FIXME */
-                                && isprint((int)value)) {
-                                       ch = (int)value;
-                                       buffer[bufp++] = S_QUOTE;
-                                       if (ch == '\\'
-                                        || ch == S_QUOTE)
-                                               buffer[bufp++] = '\\';
-                                       buffer[bufp++] = ch;
-                                       buffer[bufp++] = S_QUOTE;
-                                       str = dst;
-                               } else {
-                                       buffer[bufp++] = *str;
-                               }
-                           } else {
-                                   buffer[bufp++] = *str;
-                           }
-                           break;
-                       default:
-                           buffer[bufp++] = *str;
-                           break;
-                       }
-               }
-               else if (ch == 128) {
-                       buffer[bufp++] = '\\';
-                       buffer[bufp++] = '0';
-               }
-               else if (ch == '\033') {
-                       buffer[bufp++] = '\\';
-                       buffer[bufp++] = 'E';
-               }
-               else if (ch == '\\' && tic_format && (str == srcp || str[-1] != '^')) {
-                       buffer[bufp++] = '\\';
-                       buffer[bufp++] = '\\';
-               }
-               else if (ch == ' ' && tic_format && (str == srcp || trailing_spaces(str))) {
-                       buffer[bufp++] = '\\';
-                       buffer[bufp++] = 's';
+    bufp = 0;
+    while ((ch = UChar(*str)) != 0) {
+       if (ch == '%' && REALPRINT(str + 1)) {
+           buffer[bufp++] = *str++;
+           /*
+            * Though the character literals are more compact, most
+            * terminal descriptions use numbers and are not easy
+            * to read in character-literal form.
+            */
+           switch (numbers) {
+           case -1:
+               if (str[0] == S_QUOTE
+                   && str[1] != '\\'
+                   && REALPRINT(str + 1)
+                   && str[2] == S_QUOTE) {
+                   sprintf(buffer + bufp, "{%d}", str[1]);
+                   bufp += strlen(buffer + bufp);
+                   str += 2;
+               } else {
+                   buffer[bufp++] = *str;

                }
                }

-               else if ((ch == ',' || ch == ':' || ch == '^') && tic_format) {
-                       buffer[bufp++] = '\\';
+               break;
+               /*
+                * If we have a "%{number}", try to translate it into
+                * a "%'char'" form, since that will run a little faster
+                * when we're interpreting it.  Also, having one form
+                * for the constant makes it simpler to compare terminal
+                * descriptions.
+                */
+           case 1:
+               if (str[0] == L_BRACE
+                   && isdigit(UChar(str[1]))) {
+                   char *dst = 0;
+                   long value = strtol(str + 1, &dst, 0);
+                   if (dst != 0
+                       && *dst == R_BRACE
+                       && value < 127
+                       && value != '\\'        /* FIXME */
+                       && isprint((int) value)) {
+                       ch = (int) value;
+                       buffer[bufp++] = S_QUOTE;
+                       if (ch == '\\'
+                           || ch == S_QUOTE)
+                           buffer[bufp++] = '\\';

                        buffer[bufp++] = ch;
                        buffer[bufp++] = ch;

+                       buffer[bufp++] = S_QUOTE;
+                       str = dst;
+                   } else {
+                       buffer[bufp++] = *str;
+                   }
+               } else {
+                   buffer[bufp++] = *str;

                }
                }

-               else if (REALPRINT(str) && (ch != ',' && ch != ':' && !(ch == '!' && !tic_format) && ch != '^'))
-                       buffer[bufp++] = ch;
-#if 0          /* FIXME: this would be more readable (in fact the whole 'islong' logic should be removed) */
-               else if (ch == '\b') {
-                       buffer[bufp++] = '\\';
-                       buffer[bufp++] = 'b';
-               }
-               else if (ch == '\f') {
-                       buffer[bufp++] = '\\';
-                       buffer[bufp++] = 'f';
-               }
-               else if (ch == '\t' && islong) {
-                       buffer[bufp++] = '\\';
-                       buffer[bufp++] = 't';
-               }
+               break;
+           default:
+               buffer[bufp++] = *str;
+               break;
+           }
+       } else if (ch == 128) {
+           buffer[bufp++] = '\\';
+           buffer[bufp++] = '0';
+       } else if (ch == '\033') {
+           buffer[bufp++] = '\\';
+           buffer[bufp++] = 'E';
+       } else if (ch == '\\' && tic_format && (str == srcp || str[-1] != '^')) {
+           buffer[bufp++] = '\\';
+           buffer[bufp++] = '\\';
+       } else if (ch == ' ' && tic_format && (str == srcp ||
+                                              trailing_spaces(str))) {
+           buffer[bufp++] = '\\';
+           buffer[bufp++] = 's';
+       } else if ((ch == ',' || ch == ':' || ch == '^') && tic_format) {
+           buffer[bufp++] = '\\';
+           buffer[bufp++] = ch;
+       } else if (REALPRINT(str)
+                  && (ch != ','
+                      && ch != ':'
+                      && !(ch == '!' && !tic_format)
+                      && ch != '^'))
+           buffer[bufp++] = ch;
+#if 0                          /* FIXME: this would be more readable (in fact the whole 'islong' logic should be removed) */
+       else if (ch == '\b') {
+           buffer[bufp++] = '\\';
+           buffer[bufp++] = 'b';
+       } else if (ch == '\f') {
+           buffer[bufp++] = '\\';
+           buffer[bufp++] = 'f';
+       } else if (ch == '\t' && islong) {
+           buffer[bufp++] = '\\';
+           buffer[bufp++] = 't';
+       }

 #endif
 #endif

-               else if (ch == '\r' && (islong || (strlen(srcp) > 2 && str[1] == '\0'))) {
-                       buffer[bufp++] = '\\';
-                       buffer[bufp++] = 'r';
-               }
-               else if (ch == '\n' && islong) {
-                       buffer[bufp++] = '\\';
-                       buffer[bufp++] = 'n';
-               }
+       else if (ch == '\r' && (islong || (strlen(srcp) > 2 && str[1] == '\0'))) {
+           buffer[bufp++] = '\\';
+           buffer[bufp++] = 'r';
+       } else if (ch == '\n' && islong) {
+           buffer[bufp++] = '\\';
+           buffer[bufp++] = 'n';
+       }

 #define UnCtl(c) ((c) + '@')
 #define UnCtl(c) ((c) + '@')

-               else if (REALCTL(str) && ch != '\\' && (!islong || isdigit(str[1])))
-               {
-                       (void) sprintf(&buffer[bufp], "^%c", UnCtl(ch));
-                       bufp += 2;
-               }
-               else
-               {
-                       (void) sprintf(&buffer[bufp], "\\%03o", ch);
-                       bufp += 4;
-               }
-
-               str++;
+       else if (REALCTL(str) && ch != '\\'
+                && (!islong || isdigit(UChar(str[1])))) {
+           (void) sprintf(&buffer[bufp], "^%c", UnCtl(ch));
+           bufp += 2;
+       } else {
+           (void) sprintf(&buffer[bufp], "\\%03o", ch);
+           bufp += 4;

        }
 
        }
 

-       buffer[bufp] = '\0';
-       return(buffer);
+       str++;
+    }
+
+    buffer[bufp] = '\0';
+    return (buffer);

 }
 }