ncurses 6.0 - patch 20170819

[ncurses.git] / progs / tput.c

diff --git a/progs/tput.c b/progs/tput.c
index 481ae6356d16efe48c1caa8a28f945479a06e909..9bcde00054f32e57686cbb2efd5aa7d0f7ea1eca 100644 (file)
--- a/progs/tput.c
+++ b/progs/tput.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-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            *


@@ -50,7 +50,7 @@
 #include <transform.h>
 #include <tty_settings.h>
 
 #include <transform.h>
 #include <tty_settings.h>
 

-MODULE_ID("$Id: tput.c,v 1.65 2016/12/24 18:44:32 tom Exp $")
+MODULE_ID("$Id: tput.c,v 1.71 2017/08/19 13:44:27 tom Exp $")

 
 #define PUTS(s)                fputs(s, stdout)
 
 
 #define PUTS(s)                fputs(s, stdout)
 


@@ -77,7 +77,25 @@ quit(int status, const char *fmt,...)
 static void
 usage(void)
 {
 static void
 usage(void)
 {

-    fprintf(stderr, "usage: %s [-V] [-S] [-T term] capname\n", prg_name);
+#define KEEP(s) s "\n"
+    static const char msg[] =
+    {
+       KEEP("")
+       KEEP("Options:")
+       KEEP("  -S <<       read commands from standard input")
+       KEEP("  -T TERM     use this instead of $TERM")
+       KEEP("  -V          print curses-version")
+       KEEP("  -x          do not try to clear scrollback")
+       KEEP("")
+       KEEP("Commands:")
+       KEEP("  clear       clear the screen")
+       KEEP("  init        initialize the terminal")
+       KEEP("  reset       reinitialize the terminal")
+       KEEP("  capname     unlike clear/init/reset, print value for capability \"capname\"")
+    };
+#undef KEEP
+    (void) fprintf(stderr, "Usage: %s [options] [command]\n", prg_name);
+    fputs(msg, stderr);

     ExitProgram(EXIT_FAILURE);
 }
 
     ExitProgram(EXIT_FAILURE);
 }
 


@@ -118,7 +136,7 @@ exit_code(int token, int value)
 }
 
 static int
 }
 
 static int

-tput_cmd(int fd, TTY * saved_settings, int argc, char *argv[])
+tput_cmd(int fd, TTY * saved_settings, bool opt_x, int argc, char *argv[])

 {
     NCURSES_CONST char *name;
     char *s;
 {
     NCURSES_CONST char *name;
     char *s;


@@ -135,8 +153,12 @@ tput_cmd(int fd, TTY * saved_settings, int argc, char *argv[])
        int intrchar = -1;      /* new interrupt character */
        int tkillchar = -1;     /* new kill character */
 
        int intrchar = -1;      /* new interrupt character */
        int tkillchar = -1;     /* new kill character */
 

-       reset_start(stdout, is_reset, is_init);
-       reset_tty_settings(fd, saved_settings);
+       if (is_reset) {
+           reset_start(stdout, TRUE, FALSE);
+           reset_tty_settings(fd, saved_settings);
+       } else {
+           reset_start(stdout, FALSE, TRUE);
+       }

 
 #if HAVE_SIZECHANGE
        set_window_size(fd, &lines, &columns);
 
 #if HAVE_SIZECHANGE
        set_window_size(fd, &lines, &columns);


@@ -161,7 +183,7 @@ tput_cmd(int fd, TTY * saved_settings, int argc, char *argv[])
   retry:
 #endif
     if (strcmp(name, "clear") == 0) {
   retry:
 #endif
     if (strcmp(name, "clear") == 0) {

-       return clear_cmd();
+       return clear_cmd(opt_x);

     } else if ((status = tigetflag(name)) != -1) {
        return exit_code(BOOLEAN, status);
     } else if ((status = tigetnum(name)) != CANCELLED_NUMERIC) {
     } else if ((status = tigetflag(name)) != -1) {
        return exit_code(BOOLEAN, status);
     } else if ((status = tigetnum(name)) != CANCELLED_NUMERIC) {


@@ -176,18 +198,15 @@ tput_cmd(int fd, TTY * saved_settings, int argc, char *argv[])
            if ((np = _nc_find_entry(name, _nc_get_hash_table(termcap))) != 0) {
                switch (np->nte_type) {
                case BOOLEAN:
            if ((np = _nc_find_entry(name, _nc_get_hash_table(termcap))) != 0) {
                switch (np->nte_type) {
                case BOOLEAN:

-                   if (bool_from_termcap[np->nte_index])
-                       name = boolnames[np->nte_index];
+                   name = boolnames[np->nte_index];

                    break;
 
                case NUMBER:
                    break;
 
                case NUMBER:

-                   if (num_from_termcap[np->nte_index])
-                       name = numnames[np->nte_index];
+                   name = numnames[np->nte_index];

                    break;
 
                case STRING:
                    break;
 
                case STRING:

-                   if (str_from_termcap[np->nte_index])
-                       name = strnames[np->nte_index];
+                   name = strnames[np->nte_index];

                    break;
                }
                goto retry;
                    break;
                }
                goto retry;


@@ -263,6 +282,7 @@ main(int argc, char **argv)
     int result = 0;
     int fd;
     TTY tty_settings;
     int result = 0;
     int fd;
     TTY tty_settings;

+    bool opt_x = FALSE;                /* clear scrollback if possible */

 
     prg_name = check_aliases(_nc_rootname(argv[0]), TRUE);
 
 
     prg_name = check_aliases(_nc_rootname(argv[0]), TRUE);
 


@@ -280,6 +300,9 @@ main(int argc, char **argv)
        case 'V':
            puts(curses_version());
            ExitProgram(EXIT_SUCCESS);
        case 'V':
            puts(curses_version());
            ExitProgram(EXIT_SUCCESS);

+       case 'x':               /* do not try to clear scrollback */
+           opt_x = TRUE;
+           break;

        default:
            usage();
            /* NOTREACHED */
        default:
            usage();
            /* NOTREACHED */


@@ -311,7 +334,7 @@ main(int argc, char **argv)
     if (cmdline) {
        if ((argc <= 0) && !(is_clear || is_reset || is_init))
            usage();
     if (cmdline) {
        if ((argc <= 0) && !(is_clear || is_reset || is_init))
            usage();

-       ExitProgram(tput_cmd(fd, &tty_settings, argc, argv));
+       ExitProgram(tput_cmd(fd, &tty_settings, opt_x, argc, argv));

     }
 
     while (fgets(buf, sizeof(buf), stdin) != 0) {
     }
 
     while (fgets(buf, sizeof(buf), stdin) != 0) {


@@ -332,7 +355,7 @@ main(int argc, char **argv)
        argvec[argnum] = 0;
 
        if (argnum != 0
        argvec[argnum] = 0;
 
        if (argnum != 0

-           && tput_cmd(fd, &tty_settings, argnum, argvec) != 0) {
+           && tput_cmd(fd, &tty_settings, opt_x, argnum, argvec) != 0) {

            if (result == 0)
                result = 4;     /* will return value >4 */
            ++result;
            if (result == 0)
                result = 4;     /* will return value >4 */
            ++result;