ncurses 6.0 - patch 20170114

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

diff --git a/ncurses/tinfo/comp_expand.c b/ncurses/tinfo/comp_expand.c
index 840240088949acb7d9a46ef2c257ba41ea720716..742fa7c248b256ec8f61596ddd94a7a12be9c5ab 100644 (file)
--- a/ncurses/tinfo/comp_expand.c
+++ b/ncurses/tinfo/comp_expand.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2012,2016 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            *
@@ -35,7 +35,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: comp_expand.c,v 1.22 2011/05/21 18:55:07 tom Exp $")
+MODULE_ID("$Id: comp_expand.c,v 1.26 2016/09/24 21:15:51 tom Exp $")
 
 static int
 trailing_spaces(const char *src)
@@ -46,9 +46,11 @@ trailing_spaces(const char *src)
 }
 
 /* this deals with differences over whether 0x7f and 0x80..0x9f are controls */
-#define REALCTL(s) (UChar(*(s)) < 127 && iscntrl(UChar(*(s))))
+#define REALCTL(s)   (UChar(*(s)) < 127 && iscntrl(UChar(*(s))))
 #define REALPRINT(s) (UChar(*(s)) < 127 && isprint(UChar(*(s))))
 
+#define P_LIMIT(p)   (length - (size_t)(p))
+
 NCURSES_EXPORT(char *)
 _nc_tic_expand(const char *srcp, bool tic_format, int numbers)
 {
@@ -90,7 +92,8 @@ _nc_tic_expand(const char *srcp, bool tic_format, int numbers)
                    && str[1] != '\\'
                    && REALPRINT(str + 1)
                    && str[2] == S_QUOTE) {
-                   sprintf(buffer + bufp, "{%d}", str[1]);
+                   _nc_SPRINTF(buffer + bufp, _nc_SLIMIT(P_LIMIT(bufp))
+                               "{%d}", str[1]);
                    bufp += (int) strlen(buffer + bufp);
                    str += 2;
                } else {
@@ -130,6 +133,8 @@ _nc_tic_expand(const char *srcp, bool tic_format, int numbers)
                }
                break;
            default:
+               if (*str == ',')        /* minitel1 uses this */
+                   buffer[bufp++] = '\\';
                buffer[bufp++] = *str;
                break;
            }
@@ -177,10 +182,12 @@ _nc_tic_expand(const char *srcp, bool tic_format, int numbers)
 #define UnCtl(c) ((c) + '@')
        else if (REALCTL(str) && ch != '\\'
                 && (!islong || isdigit(UChar(str[1])))) {
-           (void) sprintf(&buffer[bufp], "^%c", UnCtl(ch));
+           _nc_SPRINTF(&buffer[bufp], _nc_SLIMIT(P_LIMIT(bufp))
+                       "^%c", UnCtl(ch));
            bufp += 2;
        } else {
-           (void) sprintf(&buffer[bufp], "\\%03o", ch);
+           _nc_SPRINTF(&buffer[bufp], _nc_SLIMIT(P_LIMIT(bufp))
+                       "\\%03o", ch);
            bufp += 4;
        }