ncurses 6.0 - patch 20170708

[ncurses.git] / progs / tput.c

diff --git a/progs/tput.c b/progs/tput.c
index 481ae6356d16efe48c1caa8a28f945479a06e909..5b43ca713d414a4e42274ee676d61091df1e5bab 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            *
@@ -50,7 +50,7 @@
 #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.69 2017/01/21 17:40:51 tom Exp $")
 
 #define PUTS(s)                fputs(s, stdout)
 
@@ -135,8 +135,12 @@ tput_cmd(int fd, TTY * saved_settings, int argc, char *argv[])
        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);
@@ -176,18 +180,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 (bool_from_termcap[np->nte_index])
-                       name = boolnames[np->nte_index];
+                   name = boolnames[np->nte_index];
                    break;
 
                case NUMBER:
-                   if (num_from_termcap[np->nte_index])
-                       name = numnames[np->nte_index];
+                   name = numnames[np->nte_index];
                    break;
 
                case STRING:
-                   if (str_from_termcap[np->nte_index])
-                       name = strnames[np->nte_index];
+                   name = strnames[np->nte_index];
                    break;
                }
                goto retry;