X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_initscr.c;h=e0a5c717da4b6c130dde833d4ca312075870de54;hp=0e8a2971f6cf974ad604938920ea27ec049cd143;hb=e33150410925e7858dacebb585a9bd90db683d86;hpb=7d3e03f12f3e179f5780f733fa5b78d981080d48 diff --git a/ncurses/base/lib_initscr.c b/ncurses/base/lib_initscr.c index 0e8a2971..e0a5c717 100644 --- a/ncurses/base/lib_initscr.c +++ b/ncurses/base/lib_initscr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2009,2014 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 /* needed for ISC */ #endif -MODULE_ID("$Id: lib_initscr.c,v 1.40 2014/04/26 18:47:51 juergen 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 @@ -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 */