ncurses 5.6 - patch 20080920

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

diff --git a/ncurses/base/lib_restart.c b/ncurses/base/lib_restart.c
index de0182f4269148b393f05d1463c3b0e0a0db1c52..da770d4e7c9266c1f27c5c3d64926707e216b7a1 100644 (file)
--- a/ncurses/base/lib_restart.c
+++ b/ncurses/base/lib_restart.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2007,2008 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,62 +29,69 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
 /*
  * Terminfo-only terminal setup routines:
  *
  *             int restartterm(const char *, int, int *)
- *             TERMINAL *set_curterm(TERMINAL *)
- *             int del_curterm(TERMINAL *)
  */
 
 #include <curses.priv.h>
 
-#if defined(SVR4_TERMIO) && !defined(_POSIX_SOURCE)
+#if SVR4_TERMIO && !defined(_POSIX_SOURCE)
 #define _POSIX_SOURCE
 #endif
 
-#include <term.h>      /* lines, columns, cur_term */
+#include <term.h>              /* lines, columns, cur_term */
 
-MODULE_ID("$Id: lib_restart.c,v 1.2 1999/07/24 20:10:04 tom Exp $")
+MODULE_ID("$Id: lib_restart.c,v 1.10 2008/06/21 17:31:22 tom Exp $")
 
-int restartterm(NCURSES_CONST char *termp, int filenum, int *errret)
+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));
+    T((T_CALLED("restartterm(%s,%d,%p)"), termp, filenum, errret));
 
-       setupterm(termp, filenum, errret);
+    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();
+           echo();
        else
-               noecho();
+           noecho();
 
        if (savecbreak) {
-               cbreak();
-               noraw();
+           cbreak();
+           noraw();
        } else if (saveraw) {
-               nocbreak();
-               raw();
+           nocbreak();
+           raw();
        } else {
-               nocbreak();
-               noraw();
+           nocbreak();
+           noraw();
        }
        if (savenl)
-               nl();
+           nl();
        else
-               nonl();
+           nonl();
 
        reset_prog_mode();
 
 #if USE_SIZECHANGE
-       _nc_update_screensize();
+       _nc_update_screensize(SP);
 #endif
 
-       returnCode(OK);
+       result = OK;
+    } else {
+       result = ERR;
+    }
+    returnCode(result);
 }