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 8ed7aa7dbf2f981fc48942e6b7f443b1974b4b4b..e0a5c717da4b6c130dde833d4ca312075870de54 100644 (file)
--- a/ncurses/base/lib_initscr.c
+++ b/ncurses/base/lib_initscr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2014,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            *
@@ -45,7 +45,7 @@
 #include <sys/termio.h>                /* needed for ISC */
 #endif
 
-MODULE_ID("$Id: lib_initscr.c,v 1.41 2016/05/28 23:11:26 tom Exp $")
+MODULE_ID("$Id: lib_initscr.c,v 1.43 2017/06/17 18:42:45 tom Exp $")
 
 NCURSES_EXPORT(WINDOW *)
 initscr(void)
@@ -65,8 +65,10 @@ initscr(void)
        _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
@@ -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 */