ncurses 5.6 - patch 20071222

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

diff --git a/ncurses/base/lib_restart.c b/ncurses/base/lib_restart.c
index 31da4b7cb897271672e696cee4160a8a25760389..858ef65a645d7ef0a3313171aa3198d4fbc7f560 100644 (file)
--- a/ncurses/base/lib_restart.c
+++ b/ncurses/base/lib_restart.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2000,2002 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2006,2007 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            *
@@ -29,6 +29,7 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
 /*
@@ -47,46 +48,52 @@
 
 #include <term.h>              /* lines, columns, cur_term */
 
-MODULE_ID("$Id: lib_restart.c,v 1.5 2002/08/31 22:30:10 Philippe.Blain Exp $")
+MODULE_ID("$Id: lib_restart.c,v 1.8 2007/10/13 19:59:47 tom Exp $")
 
 NCURSES_EXPORT(int)
 restartterm(NCURSES_CONST char *termp, int filenum, int *errret)
 {
-    int saveecho = SP->_echo;
-    int savecbreak = SP->_cbreak;
-    int saveraw = SP->_raw;
-    int savenl = SP->_nl;
+    int result;
 
     T((T_CALLED("restartterm(%s,%d,%p)"), termp, filenum, errret));
 
-    if (setupterm(termp, filenum, errret) != OK)
-       returnCode(ERR);
+    if (setupterm(termp, filenum, errret) != OK) {
+       result = ERR;
+    } else if (SP != 0) {
+       int saveecho = SP->_echo;
+       int savecbreak = SP->_cbreak;
+       int saveraw = SP->_raw;
+       int savenl = SP->_nl;
 
-    if (saveecho)
-       echo();
-    else
-       noecho();
+       if (saveecho)
+           echo();
+       else
+           noecho();
 
-    if (savecbreak) {
-       cbreak();
-       noraw();
-    } else if (saveraw) {
-       nocbreak();
-       raw();
-    } else {
-       nocbreak();
-       noraw();
-    }
-    if (savenl)
-       nl();
-    else
-       nonl();
+       if (savecbreak) {
+           cbreak();
+           noraw();
+       } else if (saveraw) {
+           nocbreak();
+           raw();
+       } else {
+           nocbreak();
+           noraw();
+       }
+       if (savenl)
+           nl();
+       else
+           nonl();
 
-    reset_prog_mode();
+       reset_prog_mode();
 
 #if USE_SIZECHANGE
-    _nc_update_screensize();
+       _nc_update_screensize();
 #endif
 
-    returnCode(OK);
+       result = OK;
+    } else {
+       result = ERR;
+    }
+    returnCode(result);
 }