ncurses 6.4 - patch 20230211

[ncurses.git] / test / foldkeys.c

diff --git a/test/foldkeys.c b/test/foldkeys.c
index bcda90c203aaa167d708a71022fda13555982f16..99471716b02c66dcafca83a54433c51b438c5ef2 100644 (file)
--- a/test/foldkeys.c
+++ b/test/foldkeys.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2006-2017,2018 Free Software Foundation, Inc.              *
+ * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 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 +30,7 @@
 /*
  * Author: Thomas E. Dickey, 2006
  *
- * $Id: foldkeys.c,v 1.7 2018/12/29 17:53:03 tom Exp $
+ * $Id: foldkeys.c,v 1.11 2022/12/10 23:31:31 tom Exp $
  *
  * Demonstrate a method for altering key definitions at runtime.
  *
@@ -53,10 +54,10 @@ 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;
@@ -145,7 +146,8 @@ demo_foldkeys(void)
        int first, second;
        char final[2];
        char *value;
-       size_t need = 0;
+       size_t need;
+
        if (info[j].state == 0
            && sscanf(info[j].value,
                      "\033[%d;%d%c",
@@ -155,6 +157,7 @@ demo_foldkeys(void)
            && *final != ';'
            && (need = strlen(info[j].value)) != 0
            && (value = strdup(info[j].value)) != 0) {
+           (void) need;        /* _nc_SLIMIT is normally nothing  */
            _nc_SPRINTF(value, _nc_SLIMIT(need) "\033[%d%c", first, *final);
            for (k = 0; k < info_len; ++k) {
                if (info[k].state == 0
@@ -190,15 +193,47 @@ demo_foldkeys(void)
     printw("Merged to %d key definitions\n", info_len - merged);
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+       "Usage: foldkeys [options]"
+       ,""
+       ,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+       fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     int ch;
 #if HAVE_GETTIMEOFDAY
-    int secs, msecs;
-    struct timeval current, previous;
+    struct timeval previous;
 #endif
 
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+       switch (ch) {
+       case OPTS_VERSION:
+           show_version(argv);
+           ExitProgram(EXIT_SUCCESS);
+       default:
+           usage(ch == OPTS_USAGE);
+           /* NOTREACHED */
+       }
+    }
+    if (optind < argc)
+       usage(FALSE);
+
     if (newterm(0, stdout, stdin) == 0) {
        fprintf(stderr, "Cannot initialize terminal\n");
        ExitProgram(EXIT_FAILURE);
@@ -224,6 +259,9 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
        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);