ncurses 6.2 - patch 20200718
[ncurses.git] / test / ins_wide.c
index a168dc112fcb52c73b9b3108abc920f442707505..9f733924a44a29cf5f29b3b22251cd48ca7c6b96 100644 (file)
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2002-2010,2012 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2002-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            *
@@ -26,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: ins_wide.c,v 1.20 2012/12/16 00:51:02 tom Exp $
+ * $Id: ins_wide.c,v 1.25 2020/02/02 23:34:34 tom Exp $
  *
  * Demonstrate the wins_wstr() and wins_wch functions.
  * Thomas Dickey - 2002/11/23
@@ -132,7 +133,7 @@ ColOf(wchar_t *buffer, int length, int margin)
            result += 2;
            break;
        default:
-           result += wcwidth(ch);
+           result += wcwidth((wchar_t) ch);
            if (ch < 32)
                ++result;
            break;
@@ -236,7 +237,8 @@ test_inserts(int level)
        static char cmd[80];
        setlocale(LC_ALL, "");
 
-       putenv(strcpy(cmd, "TABSIZE=8"));
+       _nc_STRCPY(cmd, "TABSIZE=8", sizeof(cmd));
+       putenv(cmd);
 
        initscr();
        (void) cbreak();        /* take input chars one at a time, no wait for \n */
@@ -390,7 +392,9 @@ test_inserts(int level)
            }
            break;
        default:
-           buffer[length++] = ch;
+           if (length >= BUFSIZ - 2)
+               break;
+           buffer[length++] = (wchar_t) ch;
            buffer[length] = '\0';
 
            /* put the string in, one character at a time */
@@ -455,7 +459,7 @@ usage(void)
 {
     static const char *tbl[] =
     {
-       "Usage: inserts [options]"
+       "Usage: ins_wide [options]"
        ,""
        ,"Options:"
        ,"  -f FILE read data from given file"