Fix saving/restoring tty modes, allow initscr be called twice,

from ncurses 4.1

1 files changed, 14 insertions, 5 deletions

diff --git a/lib/libncurses/lib_initscr.c b/lib/libncurses/lib_initscr.c
index 5c9dfc3..1c2d9e3 100644
--- a/lib/libncurses/lib_initscr.c
+++ b/lib/libncurses/lib_initscr.c
@@ -15,17 +15,26 @@
 
 WINDOW *initscr()
 {
+static	bool initialized = FALSE;
+char *name;
 #ifdef TRACE
 	_init_trace();
 
 	T(("initscr() called"));
 #endif
 
-  	if (newterm(getenv("TERM"), stdout, stdin) == NULL)
-    	return NULL;
-	else {
-		def_shell_mode();
+	/* Portable applications must not call initscr() more than once */
+	if (!initialized) {
+		initialized = TRUE;
+
+		if ((name = getenv("TERM")) == 0)
+			name = "unknown";
+		if (newterm(name, stdout, stdin) == 0) {
+			fprintf(stderr, "Error opening terminal: %s.\n", name);
+			exit(1);
+		}
+		/* def_shell_mode - done in newterm */
 		def_prog_mode();
-		return(stdscr);
 	}
+	return(stdscr);
 }