ncurses 6.0 - patch 20160528

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

diff --git a/ncurses/base/lib_initscr.c b/ncurses/base/lib_initscr.c
index 6fc2fb0a00719786247874202abdf9064d29dc0b..8ed7aa7dbf2f981fc48942e6b7f443b1974b4b4b 100644 (file)
--- a/ncurses/base/lib_initscr.c
+++ b/ncurses/base/lib_initscr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2014,2016 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,21 +45,23 @@
 #include <sys/termio.h>                /* needed for ISC */
 #endif
 
-MODULE_ID("$Id: lib_initscr.c,v 1.37 2008/06/07 14:00:12 tom Exp $")
+MODULE_ID("$Id: lib_initscr.c,v 1.41 2016/05/28 23:11:26 tom Exp $")
 
 NCURSES_EXPORT(WINDOW *)
 initscr(void)
 {
     WINDOW *result;
 
-    NCURSES_CONST char *name;
-
     START_TRACE();
     T((T_CALLED("initscr()")));
 
+    _nc_init_pthreads();
     _nc_lock_global(curses);
+
     /* 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
@@ -73,9 +75,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");
@@ -88,7 +90,11 @@ initscr(void)
        }
 
        /* def_shell_mode - done in newterm/_nc_setupscreen */
+#if NCURSES_SP_FUNCS
+       NCURSES_SP_NAME(def_prog_mode) (CURRENT_SCREEN);
+#else
        def_prog_mode();
+#endif
     }
     result = stdscr;
     _nc_unlock_global(curses);