ncurses 6.1 - patch 20190406

[ncurses.git] / ncurses / base / lib_initscr.c

diff --git a/ncurses/base/lib_initscr.c b/ncurses/base/lib_initscr.c
index 334682fab71d187bc8c11fbca08988cb9fc5d0a0..e0a5c717da4b6c130dde833d4ca312075870de54 100644 (file)
--- a/ncurses/base/lib_initscr.c
+++ b/ncurses/base/lib_initscr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2008,2009 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            *
@@ -45,15 +45,13 @@
 #include <sys/termio.h>                /* needed for ISC */
 #endif
 
-MODULE_ID("$Id: lib_initscr.c,v 1.39 2009/02/14 20:55:49 tom Exp $")
+MODULE_ID("$Id: lib_initscr.c,v 1.43 2017/06/17 18:42:45 tom Exp $")
 
 NCURSES_EXPORT(WINDOW *)
 initscr(void)
 {
     WINDOW *result;
 
-    NCURSES_CONST char *name;
-
     START_TRACE();
     T((T_CALLED("initscr()")));
 
@@ -62,11 +60,15 @@ initscr(void)
 
     /* Portable applications must not call initscr() more than once */
     if (!_nc_globals.init_screen) {
+       NCURSES_CONST char *name;
+
        _nc_globals.init_screen = TRUE;
 
        if ((name = getenv("TERM")) == 0
-           || *name == '\0')
-           name = "unknown";
+           || *name == '\0') {
+           static char unknown_name[] = "unknown";
+           name = unknown_name;
+       }
 #ifdef __CYGWIN__
        /*
         * 2002/9/21
@@ -75,9 +77,9 @@ initscr(void)
         * core when attempting to write to stdout.  Opening /dev/tty
         * explicitly seems to fix the problem.
         */
-       if (isatty(fileno(stdout))) {
+       if (NC_ISATTY(fileno(stdout))) {
            FILE *fp = fopen("/dev/tty", "w");
-           if (fp != 0 && isatty(fileno(fp))) {
+           if (fp != 0 && NC_ISATTY(fileno(fp))) {
                fclose(stdout);
                dup2(fileno(fp), STDOUT_FILENO);
                stdout = fdopen(STDOUT_FILENO, "w");
@@ -86,7 +88,7 @@ initscr(void)
 #endif
        if (newterm(name, stdout, stdin) == 0) {
            fprintf(stderr, "Error opening terminal: %s.\n", name);
-           exit(EXIT_FAILURE);
+           ExitProgram(EXIT_FAILURE);
        }
 
        /* def_shell_mode - done in newterm/_nc_setupscreen */