ncurses 6.0 - patch 20170401

[ncurses.git] / ncurses / tinfo / lib_cur_term.c

diff --git a/ncurses/tinfo/lib_cur_term.c b/ncurses/tinfo/lib_cur_term.c
index c67e163103eeac0b2a4d90441e65f535974f2f25..c583aa7edaf5afc14b143114637bf357c9c368e6 100644 (file)
--- a/ncurses/tinfo/lib_cur_term.c
+++ b/ncurses/tinfo/lib_cur_term.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2010,2012 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -39,14 +39,12 @@
 #include <curses.priv.h>
 #include <termcap.h>           /* ospeed */
 
 #include <curses.priv.h>
 #include <termcap.h>           /* ospeed */
 

-MODULE_ID("$Id: lib_cur_term.c,v 1.31 2012/11/18 02:12:43 tom Exp $")
+MODULE_ID("$Id: lib_cur_term.c,v 1.36 2017/04/01 17:19:03 tom Exp $")

 
 #undef CUR
 #define CUR termp->type.
 
 
 #undef CUR
 #define CUR termp->type.
 

-#if BROKEN_LINKER && !USE_REENTRANT
-NCURSES_EXPORT_VAR(TERMINAL *) cur_term = 0;
-#elif BROKEN_LINKER || USE_REENTRANT
+#if USE_REENTRANT

 
 NCURSES_EXPORT(TERMINAL *)
 NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_DCL0)
 
 NCURSES_EXPORT(TERMINAL *)
 NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_DCL0)


@@ -55,6 +53,7 @@ NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_DCL0)
 }
 
 #if NCURSES_SP_FUNCS
 }
 
 #if NCURSES_SP_FUNCS

+

 NCURSES_EXPORT(TERMINAL *)
 _nc_get_cur_term(void)
 {
 NCURSES_EXPORT(TERMINAL *)
 _nc_get_cur_term(void)
 {


@@ -87,10 +86,10 @@ NCURSES_SP_NAME(set_curterm) (NCURSES_SP_DCLx TERMINAL * termp)
     oldterm = cur_term;
     if (SP_PARM)
        SP_PARM->_term = termp;
     oldterm = cur_term;
     if (SP_PARM)
        SP_PARM->_term = termp;

-#if BROKEN_LINKER && !USE_REENTRANT
-    cur_term = termp;
-#else
+#if USE_REENTRANT

     CurTerm = termp;
     CurTerm = termp;

+#else
+    cur_term = termp;

 #endif
     if (termp != 0) {
 #ifdef USE_TERM_DRIVER
 #endif
     if (termp != 0) {
 #ifdef USE_TERM_DRIVER


@@ -105,6 +104,11 @@ NCURSES_SP_NAME(set_curterm) (NCURSES_SP_DCLx TERMINAL * termp)
        if (termp->type.Strings) {
            PC = (char) ((pad_char != NULL) ? pad_char[0] : 0);
        }
        if (termp->type.Strings) {
            PC = (char) ((pad_char != NULL) ? pad_char[0] : 0);
        }

+#endif
+#if !USE_REENTRANT
+#define MY_SIZE (size_t) (NAMESIZE - 1)
+       _nc_STRNCPY(ttytype, termp->type.term_names, MY_SIZE);
+       ttytype[MY_SIZE] = '\0';

 #endif
     }
     _nc_unlock_global(curses);
 #endif
     }
     _nc_unlock_global(curses);


@@ -133,9 +137,7 @@ NCURSES_SP_NAME(del_curterm) (NCURSES_SP_DCLx TERMINAL * termp)
        TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) termp;
 #endif
        TERMINAL *cur = (
        TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) termp;
 #endif
        TERMINAL *cur = (

-#if BROKEN_LINKER && !USE_REENTRANT
-                           cur_term
-#elif BROKEN_LINKER || USE_REENTRANT
+#if USE_REENTRANT

                            NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_ARG)
 #else
                            cur_term
                            NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_ARG)
 #else
                            cur_term


@@ -154,9 +156,13 @@ NCURSES_SP_NAME(del_curterm) (NCURSES_SP_DCLx TERMINAL * termp)
 #endif
 #ifdef USE_TERM_DRIVER
        if (TCB->drv)
 #endif
 #ifdef USE_TERM_DRIVER
        if (TCB->drv)

-           TCB->drv->release(TCB);
+           TCB->drv->td_release(TCB);

 #endif
        free(termp);
 #endif
        free(termp);

+#if NO_LEAKS
+       /* discard memory used in tgetent's cache for this terminal */
+       _nc_tgetent_leak(termp);
+#endif

 
        rc = OK;
     }
 
        rc = OK;
     }


@@ -167,7 +173,7 @@ NCURSES_SP_NAME(del_curterm) (NCURSES_SP_DCLx TERMINAL * termp)
 NCURSES_EXPORT(int)
 del_curterm(TERMINAL * termp)
 {
 NCURSES_EXPORT(int)
 del_curterm(TERMINAL * termp)
 {

-    int rc = ERR;
+    int rc;

 
     _nc_lock_global(curses);
     rc = NCURSES_SP_NAME(del_curterm) (CURRENT_SCREEN, termp);
 
     _nc_lock_global(curses);
     rc = NCURSES_SP_NAME(del_curterm) (CURRENT_SCREEN, termp);