ncurses 6.0 - patch 20151017

[ncurses.git] / test / view.c

diff --git a/test/view.c b/test/view.c
index cf11cbf04cfbddbec443453891c38acfb7fe1390..fcc0705431f6624c54b0b868e9d9ec0e50923d2d 100644 (file)
--- a/test/view.c
+++ b/test/view.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2013,2015 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            *
@@ -50,7 +50,7 @@
  * scroll operation worked, and the refresh() code only had to do a
  * partial repaint.
  *
- * $Id: view.c,v 1.90 2013/01/05 23:18:13 tom Exp $
+ * $Id: view.c,v 1.95 2015/10/10 20:03:58 tom Exp $
  */
 
 #include <test.priv.h>
@@ -85,7 +85,7 @@
 #undef CTRL
 #define CTRL(x)        ((x) & 0x1f)
 
-static RETSIGTYPE finish(int sig) GCC_NORETURN;
+static void finish(int sig) GCC_NORETURN;
 static void show_all(const char *tag);
 
 #if defined(SIGWINCH) && defined(TIOCGWINSZ) && HAVE_RESIZE_TERM
@@ -95,7 +95,7 @@ static void show_all(const char *tag);
 #endif
 
 #if CAN_RESIZE
-static RETSIGTYPE adjust(int sig);
+static void adjust(int sig);
 static int interrupted;
 static bool waiting = FALSE;
 #endif
@@ -188,20 +188,23 @@ ch_dup(char *src)
     for (j = k = 0; j < len; j++) {
 #if USE_WIDEC_SUPPORT
        rc = (size_t) check_mbytes(wch, src + j, len - j, state);
-       if (rc == (size_t) -1 || rc == (size_t) -2)
+       if (rc == (size_t) -1 || rc == (size_t) -2) {
            break;
+       }
        j += rc - 1;
-       if ((width = wcwidth(wch)) < 0)
-           break;
-       if ((width > 0 && l > 0) || l == CCHARW_MAX) {
+       width = wcwidth(wch);
+       if (width == 0) {
+           if (l == 0) {
+               wstr[l++] = L' ';
+           }
+       } else if ((l > 0) || (l == CCHARW_MAX)) {
            wstr[l] = L'\0';
            l = 0;
-           if (setcchar(dst + k, wstr, 0, 0, NULL) != OK)
+           if (setcchar(dst + k, wstr, 0, 0, NULL) != OK) {
                break;
+           }
            ++k;
        }
-       if (width == 0 && l == 0)
-           wstr[l++] = L' ';
        wstr[l++] = wch;
 #else
        dst[k++] = (chtype) UChar(src[j]);
@@ -233,7 +236,7 @@ main(int argc, char *argv[])
     int value = 0;
     bool done = FALSE;
     bool got_number = FALSE;
-    bool single_step = TRUE;
+    bool single_step = FALSE;
 #if CAN_RESIZE
     bool nonposix_resize = FALSE;
 #endif
@@ -274,7 +277,7 @@ main(int argc, char *argv[])
        case 'T':
            {
                char *next = 0;
-               int tvalue = strtol(optarg, &next, 0);
+               int tvalue = (int) strtol(optarg, &next, 0);
                if (tvalue < 0 || (next != 0 && *next != 0))
                    usage();
                trace((unsigned) tvalue);
@@ -329,10 +332,11 @@ main(int argc, char *argv[])
        /* convert tabs and nonprinting chars so that shift will work properly */
        for (s = buf, d = temp, col = 0; (*d = *s) != '\0'; s++) {
            if (*d == '\r') {
-               if (s[1] == '\n')
+               if (s[1] == '\n') {
                    continue;
-               else
+               } else {
                    break;
+               }
            }
            if (*d == '\n') {
                *d = '\0';
@@ -507,7 +511,7 @@ main(int argc, char *argv[])
     finish(0);                 /* we're done */
 }
 
-static RETSIGTYPE
+static void
 finish(int sig)
 {
     endwin();
@@ -534,7 +538,7 @@ finish(int sig)
  * The 'wrefresh(curscr)' is needed to force the refresh to start from the top
  * of the screen -- some xterms mangle the bitmap while resizing.
  */
-static RETSIGTYPE
+static void
 adjust(int sig)
 {
     if (waiting || sig == 0) {
@@ -577,7 +581,7 @@ show_all(const char *tag)
     printw("%.*s", COLS, temp);
     clrtoeol();
     this_time = time((time_t *) 0);
-    strncpy(temp, ctime(&this_time), 30);
+    strncpy(temp, ctime(&this_time), (size_t) 30);
     if ((i = (int) strlen(temp)) != 0) {
        temp[--i] = 0;
        if (move(0, COLS - i - 2) != ERR)