ncurses 6.2 - patch 20200718

[ncurses.git] / test / ins_wide.c

diff --git a/test/ins_wide.c b/test/ins_wide.c
index 8e7c123b5ffeac8a02176ec3057070a3b0fdd6f2..9f733924a44a29cf5f29b3b22251cd48ca7c6b96 100644 (file)
--- a/test/ins_wide.c
+++ b/test/ins_wide.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2002-2012,2014 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            *
  *                                                                          *
  * 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.                                                           *
  ****************************************************************************/
 /*
  * authorization.                                                           *
  ****************************************************************************/
 /*

- * $Id: ins_wide.c,v 1.21 2014/08/02 17:24:55 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
  *
  * Demonstrate the wins_wstr() and wins_wch functions.
  * Thomas Dickey - 2002/11/23


@@ -236,7 +237,8 @@ test_inserts(int level)
        static char cmd[80];
        setlocale(LC_ALL, "");
 
        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 */
 
        initscr();
        (void) cbreak();        /* take input chars one at a time, no wait for \n */


@@ -390,6 +392,8 @@ test_inserts(int level)
            }
            break;
        default:
            }
            break;
        default:

+           if (length >= BUFSIZ - 2)
+               break;

            buffer[length++] = (wchar_t) ch;
            buffer[length] = '\0';
 
            buffer[length++] = (wchar_t) ch;
            buffer[length] = '\0';
 


@@ -455,7 +459,7 @@ usage(void)
 {
     static const char *tbl[] =
     {
 {
     static const char *tbl[] =
     {

-       "Usage: inserts [options]"
+       "Usage: ins_wide [options]"

        ,""
        ,"Options:"
        ,"  -f FILE read data from given file"
        ,""
        ,"Options:"
        ,"  -f FILE read data from given file"