ncurses 6.0 - patch 20170617

[ncurses.git] / test / demo_altkeys.c

diff --git a/test/demo_altkeys.c b/test/demo_altkeys.c
index 9d46ac09befb6eab093dda7990498b9044d3c605..a83a549d23b5e19454da0eefed1b8715a8433e2f 100644 (file)
--- a/test/demo_altkeys.c
+++ b/test/demo_altkeys.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2005-2006,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 2005-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 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
  * authorization.                                                           *
  ****************************************************************************/
 /*

- * $Id: demo_altkeys.c,v 1.8 2008/04/12 22:06:22 tom Exp $
+ * $Id: demo_altkeys.c,v 1.11 2017/06/17 18:33:03 tom Exp $

  *
  * Demonstrate the define_key() function.
  * Thomas Dickey - 2005/10/22
  *
  * Demonstrate the define_key() function.
  * Thomas Dickey - 2005/10/22


@@ -91,7 +91,10 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 
     unlink(MY_LOGFILE);
 
 
     unlink(MY_LOGFILE);
 

-    newterm(0, stdout, stdin);
+    if (newterm(0, stdout, stdin) == 0) {
+       fprintf(stderr, "Cannot initialize terminal\n");
+       ExitProgram(EXIT_FAILURE);
+    }

     (void) cbreak();           /* take input chars one at a time, no wait for \n */
     (void) noecho();           /* don't echo input */
 
     (void) cbreak();           /* take input chars one at a time, no wait for \n */
     (void) noecho();           /* don't echo input */
 


@@ -104,14 +107,15 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
      */
     for (n = 0; n < 255; ++n) {
        char temp[10];
      */
     for (n = 0; n < 255; ++n) {
        char temp[10];

-       sprintf(temp, "\033%c", n);
+       _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "\033%c", n);

        define_key(temp, n + MY_KEYS);
     }
     for (n = KEY_MIN; n < KEY_MAX; ++n) {
        char *value;
        if ((value = keybound(n, 0)) != 0) {
        define_key(temp, n + MY_KEYS);
     }
     for (n = KEY_MIN; n < KEY_MAX; ++n) {
        char *value;
        if ((value = keybound(n, 0)) != 0) {

-           char *temp = typeMalloc(char, strlen(value) + 2);
-           sprintf(temp, "\033%s", value);
+           size_t need = strlen(value) + 2;
+           char *temp = typeMalloc(char, need);
+           _nc_SPRINTF(temp, _nc_SLIMIT(need) "\033%s", value);

            define_key(temp, n + MY_KEYS);
            free(temp);
            free(value);
            define_key(temp, n + MY_KEYS);
            free(temp);
            free(value);


@@ -128,8 +132,8 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 
 #if HAVE_GETTIMEOFDAY
        gettimeofday(&current, 0);
 
 #if HAVE_GETTIMEOFDAY
        gettimeofday(&current, 0);

-       secs = current.tv_sec - previous.tv_sec;
-       msecs = (current.tv_usec - previous.tv_usec) / 1000;
+       secs = (int) (current.tv_sec - previous.tv_sec);
+       msecs = (int) ((current.tv_usec - previous.tv_usec) / 1000);

        if (msecs < 0) {
            msecs += 1000;
            --secs;
        if (msecs < 0) {
            msecs += 1000;
            --secs;