ncurses 6.1 - patch 20190504

[ncurses.git] / progs / tput.c

diff --git a/progs/tput.c b/progs/tput.c
index 5b43ca713d414a4e42274ee676d61091df1e5bab..88e757994fa123a0e4d241b05509e1bca0f13947 100644 (file)
--- a/progs/tput.c
+++ b/progs/tput.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2017,2018 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            *
@@ -50,7 +50,7 @@
 #include <transform.h>
 #include <tty_settings.h>
 
-MODULE_ID("$Id: tput.c,v 1.69 2017/01/21 17:40:51 tom Exp $")
+MODULE_ID("$Id: tput.c,v 1.79 2018/06/30 15:56:01 Nicholas.Marriott Exp $")
 
 #define PUTS(s)                fputs(s, stdout)
 
@@ -77,8 +77,26 @@ quit(int status, const char *fmt,...)
 static void
 usage(void)
 {
-    fprintf(stderr, "usage: %s [-V] [-S] [-T term] capname\n", prg_name);
-    ExitProgram(EXIT_FAILURE);
+#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(ErrUsage);
 }
 
 static char *
@@ -117,8 +135,11 @@ exit_code(int token, int value)
     return result;
 }
 
+/*
+ * Returns nonzero on error.
+ */
 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;
@@ -165,7 +186,7 @@ tput_cmd(int fd, TTY * saved_settings, int argc, char *argv[])
   retry:
 #endif
     if (strcmp(name, "clear") == 0) {
-       return clear_cmd();
+       return (clear_cmd(opt_x) == ERR) ? ErrUsage : 0;
     } else if ((status = tigetflag(name)) != -1) {
        return exit_code(BOOLEAN, status);
     } else if ((status = tigetnum(name)) != CANCELLED_NUMERIC) {
@@ -195,8 +216,8 @@ tput_cmd(int fd, TTY * saved_settings, int argc, char *argv[])
            }
        }
 #endif
-       quit(4, "unknown terminfo capability '%s'", name);
-    } else if (s != ABSENT_STRING) {
+       quit(ErrCapName, "unknown terminfo capability '%s'", name);
+    } else if (VALID_STRING(s)) {
        if (argc > 1) {
            int k;
            int ignored;
@@ -264,33 +285,46 @@ main(int argc, char **argv)
     int result = 0;
     int fd;
     TTY tty_settings;
+    bool opt_x = FALSE;                /* clear scrollback if possible */
+    bool is_alias;
+    bool need_tty;
 
     prg_name = check_aliases(_nc_rootname(argv[0]), TRUE);
 
     term = getenv("TERM");
 
-    while ((c = getopt(argc, argv, "ST:V")) != -1) {
+    while ((c = getopt(argc, argv, "ST:Vx")) != -1) {
        switch (c) {
        case 'S':
            cmdline = FALSE;
            break;
        case 'T':
            use_env(FALSE);
+           use_tioctl(TRUE);
            term = optarg;
            break;
        case 'V':
            puts(curses_version());
            ExitProgram(EXIT_SUCCESS);
+       case 'x':               /* do not try to clear scrollback */
+           opt_x = TRUE;
+           break;
        default:
            usage();
            /* NOTREACHED */
        }
     }
 
+    is_alias = (is_clear || is_reset || is_init);
+    need_tty = ((is_reset || is_init) ||
+               (optind < argc &&
+                (!strcmp(argv[optind], "reset") ||
+                 !strcmp(argv[optind], "init"))));
+
     /*
      * Modify the argument list to omit the options we processed.
      */
-    if (is_clear || is_reset || is_init) {
+    if (is_alias) {
        if (optind-- < argc) {
            argc -= optind;
            argv += optind;
@@ -302,17 +336,17 @@ main(int argc, char **argv)
     }
 
     if (term == 0 || *term == '\0')
-       quit(2, "No value for $TERM and no -T specified");
+       quit(ErrUsage, "No value for $TERM and no -T specified");
 
-    fd = save_tty_settings(&tty_settings);
+    fd = save_tty_settings(&tty_settings, need_tty);
 
     if (setupterm(term, fd, &errret) != OK && errret <= 0)
-       quit(3, "unknown terminal \"%s\"", term);
+       quit(ErrTermType, "unknown terminal \"%s\"", term);
 
     if (cmdline) {
-       if ((argc <= 0) && !(is_clear || is_reset || is_init))
+       if ((argc <= 0) && !is_alias)
            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) {
@@ -333,9 +367,9 @@ main(int argc, char **argv)
        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 = ErrSystem(0);  /* will return value >4 */
            ++result;
        }
     }