aboutsummaryrefslogtreecommitdiff
path: root/test/demo_altkeys.c
diff options
context:
space:
mode:
Diffstat (limited to 'test/demo_altkeys.c')
-rw-r--r--test/demo_altkeys.c40
1 files changed, 18 insertions, 22 deletions
diff --git a/test/demo_altkeys.c b/test/demo_altkeys.c
index f2b07b1c8c90..d85bac48bce2 100644
--- 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-2018,2019 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,27 +26,17 @@
* authorization. *
****************************************************************************/
/*
- * $Id: demo_altkeys.c,v 1.9 2010/11/14 00:59:26 tom Exp $
+ * $Id: demo_altkeys.c,v 1.13 2019/08/17 21:49:40 tom Exp $
*
* Demonstrate the define_key() function.
* Thomas Dickey - 2005/10/22
*/
+#define NEED_TIME_H
#include <test.priv.h>
#if defined(NCURSES_VERSION) && NCURSES_EXT_FUNCS
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
#define MY_LOGFILE "demo_altkeys.log"
#define MY_KEYS (KEY_MAX + 1)
@@ -57,11 +47,12 @@ static void
log_last_line(WINDOW *win)
{
FILE *fp;
- int y, x, n;
- char temp[256];
if ((fp = fopen(MY_LOGFILE, "a")) != 0) {
+ char temp[256];
+ int y, x, n;
int need = sizeof(temp) - 1;
+
if (need > COLS)
need = COLS;
getyx(win, y, x);
@@ -85,13 +76,15 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
int n;
int ch;
#if HAVE_GETTIMEOFDAY
- int secs, msecs;
- struct timeval current, previous;
+ struct timeval previous;
#endif
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 */
@@ -104,14 +97,15 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
*/
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) {
- 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);
@@ -125,8 +119,10 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
while ((ch = getch()) != ERR) {
bool escaped = (ch >= MY_KEYS);
const char *name = keyname(escaped ? (ch - MY_KEYS) : ch);
-
#if HAVE_GETTIMEOFDAY
+ int secs, msecs;
+ struct timeval current;
+
gettimeofday(&current, 0);
secs = (int) (current.tv_sec - previous.tv_sec);
msecs = (int) ((current.tv_usec - previous.tv_usec) / 1000);