X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Flib_restart.c;h=6dc183144be4ac366a56a62973638ff8c26b3d80;hp=54ee81ea8f27bbad8ee55ac515a77b877db0bfd8;hb=661078ddbde3ce0f3b06e95642fbb9b5fef7dca1;hpb=3a9b6a3bf0269231bef7de74757a910dedd04e0c;ds=sidebyside

diff --git a/ncurses/lib_restart.c b/ncurses/lib_restart.c
index 54ee81ea..6dc18314 100644
--- a/ncurses/lib_restart.c
+++ b/ncurses/lib_restart.c
@@ -1,23 +1,35 @@
-
-/***************************************************************************
-*                            COPYRIGHT NOTICE                              *
-****************************************************************************
-*                ncurses is copyright (C) 1992-1995                        *
-*                          Zeyd M. Ben-Halim                               *
-*                          zmbenhal@netcom.com                             *
-*                          Eric S. Raymond                                 *
-*                          esr@snark.thyrsus.com                           *
-*                                                                          *
-*        Permission is hereby granted to reproduce and distribute ncurses  *
-*        by any means and for any fee, whether alone or as part of a       *
-*        larger distribution, in source or in binary form, PROVIDED        *
-*        this notice is included with any such distribution, and is not    *
-*        removed from any of its header files. Mention of ncurses in any   *
-*        applications linked with it is highly appreciated.                *
-*                                                                          *
-*        ncurses comes AS IS with no warranty, implied or expressed.       *
-*                                                                          *
-***************************************************************************/
+/****************************************************************************
+ * Copyright (c) 1998 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            *
+ * "Software"), to deal in the Software without restriction, including      *
+ * without limitation the rights to use, copy, modify, merge, publish,      *
+ * distribute, distribute with modifications, sublicense, and/or sell       *
+ * copies of the Software, and to permit persons to whom the Software is    *
+ * furnished to do so, subject to the following conditions:                 *
+ *                                                                          *
+ * The above copyright notice and this permission notice shall be included  *
+ * in all copies or substantial portions of the Software.                   *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+ *                                                                          *
+ * Except as contained in this notice, the name(s) of the above copyright   *
+ * holders shall not be used in advertising or otherwise to promote the     *
+ * sale, use or other dealings in this Software without prior written       *
+ * authorization.                                                           *
+ ****************************************************************************/
+
+/****************************************************************************
+ *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
+ *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ ****************************************************************************/
 
 /*
  * Terminfo-only terminal setup routines:
@@ -29,13 +41,13 @@
 
 #include <curses.priv.h>
 
-#ifdef SVR4_TERMIO
+#if defined(SVR4_TERMIO) && !defined(_POSIX_SOURCE)
 #define _POSIX_SOURCE
 #endif
 
 #include <term.h>	/* lines, columns, cur_term */
 
-MODULE_ID("$Id: lib_restart.c,v 1.11 1997/02/02 01:10:25 tom Exp $")
+MODULE_ID("$Id: lib_restart.c,v 1.16 1998/02/11 12:13:57 tom Exp $")
 
 #undef tabs
 
@@ -57,15 +69,12 @@ int def_shell_mode(void)
 {
 	T((T_CALLED("def_shell_mode()")));
 
-	if (cur_term == 0)
-		returnCode(ERR);
-
 	/*
 	 * Turn off the XTABS bit in the tty structure if it was on.  If XTABS
 	 * was on, remove the tab and backtab capabilities.
 	 */
 
-	if (GET_TTY(cur_term->Filedes, &cur_term->Ottyb) == -1)
+	if (_nc_get_curterm(&cur_term->Ottyb) != OK)
 		returnCode(ERR);
 #ifdef TERMIOS
 	if (cur_term->Ottyb.c_oflag & tabs)
@@ -81,10 +90,7 @@ int def_prog_mode(void)
 {
 	T((T_CALLED("def_prog_mode()")));
 
-	if (cur_term == 0)
-		returnCode(ERR);
-
-	if (GET_TTY(cur_term->Filedes, &cur_term->Nttyb) == -1)
+	if (_nc_get_curterm(&cur_term->Nttyb) != OK)
 		returnCode(ERR);
 #ifdef TERMIOS
 	cur_term->Nttyb.c_oflag &= ~tabs;
@@ -127,28 +133,9 @@ int savenl = SP->_nl;
 
 	reset_prog_mode();
 
-	_nc_get_screensize();
+#if USE_SIZECHANGE
+	_nc_update_screensize();
+#endif
 
 	returnCode(OK);
 }
-
-TERMINAL *set_curterm(TERMINAL *term)
-{
-	TERMINAL	*oldterm = cur_term;
-
-	cur_term = term;
-	return oldterm;
-}
-
-int del_curterm(TERMINAL *term)
-{
-	T((T_CALLED("del_curterm(%p)"), term));
-
-	if (term != NULL) {
-		FreeIfNeeded(term->type.str_table);
-		FreeIfNeeded(term->type.term_names);
-		free(term);
-		returnCode(OK);
-	}
-	returnCode(ERR);
-}