ncurses 6.2 - patch 20200906

[ncurses.git] / ncurses / trace / visbuf.c

diff --git a/ncurses/trace/visbuf.c b/ncurses/trace/visbuf.c
index 0b64ccc65a7fb47d1764dfa837d39a2eea768be3..5f95a6bc50c054117a5e1f5cbdd3c8859d347bd0 100644 (file)
--- a/ncurses/trace/visbuf.c
+++ b/ncurses/trace/visbuf.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2001-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2001-2016,2017 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,12 +43,12 @@
 #include <tic.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: visbuf.c,v 1.33 2009/07/11 14:44:20 tom Exp $")
+MODULE_ID("$Id: visbuf.c,v 1.52 2020/02/02 23:34:34 tom Exp $")
 
 #define NUM_VISBUFS 4
 
 #define NormalLen(len) (size_t) (((size_t)(len) + 1) * 4)
-#define WideLen(len)   (size_t) (((size_t)(len) + 1) * 4 * MB_CUR_MAX)
+#define WideLen(len)   (size_t) (((size_t)(len) + 1) * 4 * (size_t) MB_CUR_MAX)
 
 #ifdef TRACE
 static const char d_quote[] = StringOf(D_QUOTE);
@@ -55,13 +56,21 @@ static const char l_brace[] = StringOf(L_BRACE);
 static const char r_brace[] = StringOf(R_BRACE);
 #endif
 
+#if USE_STRING_HACKS && HAVE_SNPRINTF
+#define VisChar(tp, chr, limit) _nc_vischar(tp, chr, limit)
+#define LIMIT_ARG ,size_t limit
+#else
+#define VisChar(tp, chr, limit) _nc_vischar(tp, chr)
+#define LIMIT_ARG              /* nothing */
+#endif
+
 static char *
-_nc_vischar(char *tp, unsigned c)
+_nc_vischar(char *tp, unsigned c LIMIT_ARG)
 {
     if (c == '"' || c == '\\') {
        *tp++ = '\\';
        *tp++ = (char) c;
-    } else if (is7bits(c) && (isgraph(c) || c == ' ')) {
+    } else if (is7bits((int) c) && (isgraph((int) c) || c == ' ')) {
        *tp++ = (char) c;
     } else if (c == '\n') {
        *tp++ = '\\';
@@ -72,6 +81,9 @@ _nc_vischar(char *tp, unsigned c)
     } else if (c == '\b') {
        *tp++ = '\\';
        *tp++ = 'b';
+    } else if (c == '\t') {
+       *tp++ = '\\';
+       *tp++ = 't';
     } else if (c == '\033') {
        *tp++ = '\\';
        *tp++ = 'e';
@@ -84,7 +96,8 @@ _nc_vischar(char *tp, unsigned c)
        *tp++ = '^';
        *tp++ = (char) ('@' + c);
     } else {
-       sprintf(tp, "\\%03lo", (unsigned long) ChCharOf(c));
+       _nc_SPRINTF(tp, _nc_SLIMIT(limit)
+                   "\\%03lo", (unsigned long) ChCharOf(c));
        tp += strlen(tp);
     }
     *tp = 0;
@@ -94,9 +107,9 @@ _nc_vischar(char *tp, unsigned c)
 static const char *
 _nc_visbuf2n(int bufnum, const char *buf, int len)
 {
-    const char *vbuf;
+    const char *vbuf = 0;
     char *tp;
-    int c;
+    int count;
 
     if (buf == 0)
        return ("(null)");
@@ -106,11 +119,14 @@ _nc_visbuf2n(int bufnum, const char *buf, int len)
     if (len < 0)
        len = (int) strlen(buf);
 
+    count = len;
 #ifdef TRACE
     vbuf = tp = _nc_trace_buf(bufnum, NormalLen(len));
 #else
     {
        static char *mybuf[NUM_VISBUFS];
+       int c;
+
        if (bufnum < 0) {
            for (c = 0; c < NUM_VISBUFS; ++c) {
                FreeAndNull(mybuf[c]);
@@ -123,12 +139,14 @@ _nc_visbuf2n(int bufnum, const char *buf, int len)
     }
 #endif
     if (tp != 0) {
+       int c;
+
        *tp++ = D_QUOTE;
-       while ((--len >= 0) && (c = *buf++) != '\0') {
-           tp = _nc_vischar(tp, UChar(c));
+       while ((--count >= 0) && (c = *buf++) != '\0') {
+           tp = VisChar(tp, UChar(c), NormalLen(len));
        }
        *tp++ = D_QUOTE;
-       *tp++ = '\0';
+       *tp = '\0';
     } else {
        vbuf = ("(_nc_visbuf2n failed)");
     }
@@ -174,7 +192,7 @@ _nc_viswbuf2n(int bufnum, const wchar_t *buf, int len)
 {
     const char *vbuf;
     char *tp;
-    wchar_t c;
+    int count;
 
     if (buf == 0)
        return ("(null)");
@@ -182,6 +200,7 @@ _nc_viswbuf2n(int bufnum, const wchar_t *buf, int len)
     if (len < 0)
        len = (int) wcslen(buf);
 
+    count = len;
 #ifdef TRACE
     vbuf = tp = _nc_trace_buf(bufnum, WideLen(len));
 #else
@@ -192,20 +211,23 @@ _nc_viswbuf2n(int bufnum, const wchar_t *buf, int len)
     }
 #endif
     if (tp != 0) {
+       wchar_t c;
+
        *tp++ = D_QUOTE;
-       while ((--len >= 0) && (c = *buf++) != '\0') {
+       while ((--count >= 0) && (c = *buf++) != '\0') {
            char temp[CCHARW_MAX + 80];
            int j = wctomb(temp, c), k;
            if (j <= 0) {
-               sprintf(temp, "\\u%08X", (unsigned) c);
+               _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
+                           "\\u%08X", (unsigned) c);
                j = (int) strlen(temp);
            }
            for (k = 0; k < j; ++k) {
-               tp = _nc_vischar(tp, UChar(temp[k]));
+               tp = VisChar(tp, UChar(temp[k]), WideLen(len));
            }
        }
        *tp++ = D_QUOTE;
-       *tp++ = '\0';
+       *tp = '\0';
     } else {
        vbuf = ("(_nc_viswbuf2n failed)");
     }
@@ -238,7 +260,9 @@ _nc_viswibuf(const wint_t *buf)
     static unsigned mylen;
     unsigned n;
 
-    for (n = 0; buf[n] != 0; ++n) ;
+    for (n = 0; buf[n] != 0; ++n) {
+       ;                       /* empty */
+    }
     if (mylen < ++n) {
        mylen = n + 80;
        if (mybuf != 0)
@@ -246,8 +270,12 @@ _nc_viswibuf(const wint_t *buf)
        else
            mybuf = typeMalloc(wchar_t, mylen);
     }
-    for (n = 0; buf[n] != 0; ++n)
-       mybuf[n] = (wchar_t) buf[n];
+    if (mybuf != 0) {
+       for (n = 0; buf[n] != 0; ++n) {
+           mybuf[n] = (wchar_t) buf[n];
+       }
+       mybuf[n] = L'\0';
+    }
 
     return _nc_viswbuf2(0, mybuf);
 }
@@ -257,11 +285,11 @@ _nc_viswibuf(const wint_t *buf)
 NCURSES_EXPORT(const char *)
 _nc_viscbuf2(int bufnum, const NCURSES_CH_T * buf, int len)
 {
-    char *result = _nc_trace_buf(bufnum, BUFSIZ);
-    int first;
-    const char *found;
+    char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ);
 
     if (result != 0) {
+       int first = 0;
+
 #if USE_WIDEC_SUPPORT
        if (len < 0)
            len = _nc_wchstrlen(buf);
@@ -270,7 +298,6 @@ _nc_viscbuf2(int bufnum, const NCURSES_CH_T * buf, int len)
        /*
         * Display one or more strings followed by attributes.
         */
-       first = 0;
        while (first < len) {
            attr_t attr = AttrOf(buf[first]);
            int last = len - 1;
@@ -283,48 +310,58 @@ _nc_viscbuf2(int bufnum, const NCURSES_CH_T * buf, int len)
                }
            }
 
-           result = _nc_trace_bufcat(bufnum, l_brace);
-           result = _nc_trace_bufcat(bufnum, d_quote);
+           (void) _nc_trace_bufcat(bufnum, l_brace);
+           (void) _nc_trace_bufcat(bufnum, d_quote);
            for (j = first; j <= last; ++j) {
-               found = _nc_altcharset_name(attr, (chtype) CharOf(buf[j]));
+               const char *found = _nc_altcharset_name(attr, (chtype)
+                                                       CharOf(buf[j]));
                if (found != 0) {
-                   result = _nc_trace_bufcat(bufnum, found);
+                   (void) _nc_trace_bufcat(bufnum, found);
                    attr &= ~A_ALTCHARSET;
                } else
 #if USE_WIDEC_SUPPORT
                if (!isWidecExt(buf[j])) {
                    PUTC_DATA;
 
-                   PUTC_INIT;
                    for (PUTC_i = 0; PUTC_i < CCHARW_MAX; ++PUTC_i) {
                        int k;
+                       char temp[80];
 
                        PUTC_ch = buf[j].chars[PUTC_i];
-                       if (PUTC_ch == L'\0')
+                       if (PUTC_ch == L'\0') {
+                           if (PUTC_i == 0)
+                               (void) _nc_trace_bufcat(bufnum, "\\000");
                            break;
+                       }
+                       PUTC_INIT;
                        PUTC_n = (int) wcrtomb(PUTC_buf,
                                               buf[j].chars[PUTC_i], &PUT_st);
-                       if (PUTC_n <= 0)
+                       if (PUTC_n <= 0 || buf[j].chars[PUTC_i] > 255) {
+                           _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
+                                       "{%d:\\u%lx}",
+                                       _nc_wacs_width(buf[j].chars[PUTC_i]),
+                                       (unsigned long) buf[j].chars[PUTC_i]);
+                           (void) _nc_trace_bufcat(bufnum, temp);
                            break;
+                       }
                        for (k = 0; k < PUTC_n; k++) {
-                           char temp[80];
-                           _nc_vischar(temp, UChar(PUTC_buf[k]));
-                           result = _nc_trace_bufcat(bufnum, temp);
+                           VisChar(temp, UChar(PUTC_buf[k]), sizeof(temp));
+                           (void) _nc_trace_bufcat(bufnum, temp);
                        }
                    }
                }
 #else
                {
                    char temp[80];
-                   _nc_vischar(temp, UChar(buf[j]));
-                   result = _nc_trace_bufcat(bufnum, temp);
+                   VisChar(temp, UChar(buf[j]), sizeof(temp));
+                   (void) _nc_trace_bufcat(bufnum, temp);
                }
 #endif /* USE_WIDEC_SUPPORT */
            }
-           result = _nc_trace_bufcat(bufnum, d_quote);
+           (void) _nc_trace_bufcat(bufnum, d_quote);
            if (attr != A_NORMAL) {
-               result = _nc_trace_bufcat(bufnum, " | ");
-               result = _nc_trace_bufcat(bufnum, _traceattr2(bufnum + 20, attr));
+               (void) _nc_trace_bufcat(bufnum, " | ");
+               (void) _nc_trace_bufcat(bufnum, _traceattr2(bufnum + 20, attr));
            }
            result = _nc_trace_bufcat(bufnum, r_brace);
            first = last + 1;