ncurses 6.0 - patch 20170930

[ncurses.git] / test / foldkeys.c

diff --git a/test/foldkeys.c b/test/foldkeys.c
index a5e25e30bb82a77c6b7f12569eded6af2d7426fd..f7ecfd97b9195c8fb41cd4e303538c7d8556a2d2 100644 (file)
--- a/test/foldkeys.c
+++ b/test/foldkeys.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2006 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2006-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            *
@@ -29,7 +29,7 @@
 /*
  * Author: Thomas E. Dickey, 2006
  *
- * $Id: foldkeys.c,v 1.4 2010/11/14 01:00:53 tom Exp $
+ * $Id: foldkeys.c,v 1.6 2017/06/17 19:36:33 tom Exp $
  *
  * Demonstrate a method for altering key definitions at runtime.
  *
@@ -155,6 +155,7 @@ demo_foldkeys(void)
        int first, second;
        char final[2];
        char *value;
+       size_t need = 0;
        if (info[j].state == 0
            && sscanf(info[j].value,
                      "\033[%d;%d%c",
@@ -162,8 +163,9 @@ demo_foldkeys(void)
                      &second,
                      final) == 3
            && *final != ';'
+           && (need = strlen(info[j].value)) != 0
            && (value = strdup(info[j].value)) != 0) {
-           sprintf(value, "\033[%d%c", first, *final);
+           _nc_SPRINTF(value, _nc_SLIMIT(need) "\033[%d%c", first, *final);
            for (k = 0; k < info_len; ++k) {
                if (info[k].state == 0
                    && !strcmp(info[k].value, value)) {
@@ -172,7 +174,7 @@ demo_foldkeys(void)
                }
            }
            if (info[j].state == 0) {
-               sprintf(value, "\033O%c", *final);
+               _nc_SPRINTF(value, _nc_SLIMIT(need) "\033O%c", *final);
                for (k = 0; k < info_len; ++k) {
                    if (info[k].state == 0
                        && !strcmp(info[k].value, value)) {
@@ -207,9 +209,13 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
     struct timeval current, previous;
 #endif
 
+    if (newterm(0, stdout, stdin) == 0) {
+       fprintf(stderr, "Cannot initialize terminal\n");
+       ExitProgram(EXIT_FAILURE);
+    }
+
     unlink(MY_LOGFILE);
 
-    newterm(0, stdout, stdin);
     (void) cbreak();           /* take input chars one at a time, no wait for \n */
     (void) noecho();           /* don't echo input */