X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Flib_cur_term.c;h=8fccc2f88d08bd3c2d9672e440725d886f4f631b;hp=3250147c8066eaede2749d01a01a0362bf3ed6ad;hb=60014650d5e3f088e2d5e8835925cce96db00c33;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce

diff --git a/ncurses/tinfo/lib_cur_term.c b/ncurses/tinfo/lib_cur_term.c
index 3250147c..8fccc2f8 100644
--- a/ncurses/tinfo/lib_cur_term.c
+++ b/ncurses/tinfo/lib_cur_term.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2000,2003 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            *
@@ -37,34 +37,40 @@
  */
 
 #include <curses.priv.h>
-#include <term_entry.h>	/* TTY, cur_term */
-#include <termcap.h>	/* ospeed */
+#include <term_entry.h>		/* TTY, cur_term */
+#include <termcap.h>		/* ospeed */
 
-MODULE_ID("$Id: lib_cur_term.c,v 1.8 1999/07/24 20:08:19 tom Exp $")
+MODULE_ID("$Id: lib_cur_term.c,v 1.13 2003/12/27 18:21:30 tom Exp $")
 
-TERMINAL *cur_term;
+NCURSES_EXPORT_VAR(TERMINAL *) cur_term = 0;
 
-TERMINAL *set_curterm(TERMINAL *termp)
+NCURSES_EXPORT(TERMINAL *)
+set_curterm(TERMINAL * termp)
 {
-	TERMINAL *oldterm = cur_term;
+    TERMINAL *oldterm = cur_term;
 
-	if ((cur_term = termp) != 0) {
-		ospeed = _nc_ospeed(cur_term->_baudrate);
-		PC = (pad_char != NULL) ? pad_char[0] : 0; 
-	}
-	return oldterm;
+    T((T_CALLED("set_curterm(%p)"), termp));
+
+    if ((cur_term = termp) != 0) {
+	ospeed = _nc_ospeed(cur_term->_baudrate);
+	PC = (pad_char != NULL) ? pad_char[0] : 0;
+    }
+    T((T_RETURN("%p"), oldterm));
+    return (oldterm);
 }
 
-int del_curterm(TERMINAL *termp)
+NCURSES_EXPORT(int)
+del_curterm(TERMINAL * termp)
 {
-	T((T_CALLED("del_curterm(%p)"), termp));
+    T((T_CALLED("del_curterm(%p)"), termp));
 
-	if (termp != 0) {
-		_nc_free_termtype(&(termp->type));
-		free(termp);
-		if (termp == cur_term)
-			cur_term = 0;
-		returnCode(OK);
-	}
-	returnCode(ERR);
+    if (termp != 0) {
+	_nc_free_termtype(&(termp->type));
+	FreeIfNeeded(termp->_termname);
+	free(termp);
+	if (termp == cur_term)
+	    cur_term = 0;
+	returnCode(OK);
+    }
+    returnCode(ERR);
 }