X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Ftput.c;h=481ae6356d16efe48c1caa8a28f945479a06e909;hp=b2d44f028d6baf04e402e734b6750405b386af40;hb=62ca6190a9a8ddccb2c4d5ca7b2ef9f88432da65;hpb=c885a3fdd089f784f17dd2e9c03d8eb774072dc9

diff --git a/progs/tput.c b/progs/tput.c
index b2d44f02..481ae635 100644
--- a/progs/tput.c
+++ b/progs/tput.c
@@ -48,8 +48,9 @@
 #include <termsort.c>
 #endif
 #include <transform.h>
+#include <tty_settings.h>
 
-MODULE_ID("$Id: tput.c,v 1.63 2016/10/23 01:08:28 tom Exp $")
+MODULE_ID("$Id: tput.c,v 1.65 2016/12/24 18:44:32 tom Exp $")
 
 #define PUTS(s)		fputs(s, stdout)
 
@@ -117,7 +118,7 @@ exit_code(int token, int value)
 }
 
 static int
-tput_cmd(int argc, char *argv[])
+tput_cmd(int fd, TTY * saved_settings, int argc, char *argv[])
 {
     NCURSES_CONST char *name;
     char *s;
@@ -128,29 +129,27 @@ tput_cmd(int argc, char *argv[])
 
     name = check_aliases(argv[0], FALSE);
     if (is_reset || is_init) {
-	TTY mode, oldmode;
+	TTY oldmode;
 
 	int terasechar = -1;	/* new erase character */
 	int intrchar = -1;	/* new interrupt character */
 	int tkillchar = -1;	/* new kill character */
 
-	int my_fd = save_tty_settings(&mode);
-
 	reset_start(stdout, is_reset, is_init);
-	reset_tty_settings(&mode);
+	reset_tty_settings(fd, saved_settings);
 
 #if HAVE_SIZECHANGE
-	set_window_size(my_fd, &lines, &columns);
+	set_window_size(fd, &lines, &columns);
 #else
-	(void) my_fd;
+	(void) fd;
 #endif
-	set_control_chars(&mode, terasechar, intrchar, tkillchar);
-	set_conversions(&mode);
-	if (send_init_strings(&oldmode)) {
+	set_control_chars(saved_settings, terasechar, intrchar, tkillchar);
+	set_conversions(saved_settings);
+	if (send_init_strings(fd, &oldmode)) {
 	    reset_flush();
 	}
 
-	update_tty_settings(&oldmode, &mode);
+	update_tty_settings(&oldmode, saved_settings);
 	return 0;
     }
 
@@ -262,6 +261,8 @@ main(int argc, char **argv)
     int c;
     char buf[BUFSIZ];
     int result = 0;
+    int fd;
+    TTY tty_settings;
 
     prg_name = check_aliases(_nc_rootname(argv[0]), TRUE);
 
@@ -302,13 +303,15 @@ main(int argc, char **argv)
     if (term == 0 || *term == '\0')
 	quit(2, "No value for $TERM and no -T specified");
 
-    if (setupterm(term, STDOUT_FILENO, &errret) != OK && errret <= 0)
+    fd = save_tty_settings(&tty_settings);
+
+    if (setupterm(term, fd, &errret) != OK && errret <= 0)
 	quit(3, "unknown terminal \"%s\"", term);
 
     if (cmdline) {
 	if ((argc <= 0) && !(is_clear || is_reset || is_init))
 	    usage();
-	ExitProgram(tput_cmd(argc, argv));
+	ExitProgram(tput_cmd(fd, &tty_settings, argc, argv));
     }
 
     while (fgets(buf, sizeof(buf), stdin) != 0) {
@@ -329,7 +332,7 @@ main(int argc, char **argv)
 	argvec[argnum] = 0;
 
 	if (argnum != 0
-	    && tput_cmd(argnum, argvec) != 0) {
+	    && tput_cmd(fd, &tty_settings, argnum, argvec) != 0) {
 	    if (result == 0)
 		result = 4;	/* will return value >4 */
 	    ++result;