ncurses 6.2 - patch 20200212

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

diff --git a/ncurses/base/lib_freeall.c b/ncurses/base/lib_freeall.c
index 8a13b407f699c285510f18f7f147daa08f30f52c..9133d08a7328468cae8615f35a3efff7ce40c13d 100644 (file)
--- a/ncurses/base/lib_freeall.c
+++ b/ncurses/base/lib_freeall.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 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            *
@@ -39,7 +40,7 @@
 extern int malloc_errfd;       /* FIXME */
 #endif
 
-MODULE_ID("$Id: lib_freeall.c,v 1.65 2017/03/04 00:12:23 tom Exp $")
+MODULE_ID("$Id: lib_freeall.c,v 1.72 2020/02/02 23:34:34 tom Exp $")
 
 /*
  * Free all ncurses data.  This is used for testing only (there's no practical
@@ -52,6 +53,7 @@ NCURSES_SP_NAME(_nc_freeall) (NCURSES_SP_DCL0)
 
     T((T_CALLED("_nc_freeall()")));
 #if NO_LEAKS
+    _nc_globals.leak_checking = TRUE;
     if (SP_PARM != 0) {
        if (SP_PARM->_oldnum_list != 0) {
            FreeAndNull(SP_PARM->_oldnum_list);
@@ -59,7 +61,7 @@ NCURSES_SP_NAME(_nc_freeall) (NCURSES_SP_DCL0)
        if (SP_PARM->_panelHook.destroy != 0) {
            SP_PARM->_panelHook.destroy(SP_PARM->_panelHook.stdscr_pseudo_panel);
        }
-#if USE_NEW_PAIR
+#if NCURSES_EXT_COLORS
        _nc_new_pair_leaks(SP_PARM);
 #endif
     }
@@ -76,8 +78,19 @@ NCURSES_SP_NAME(_nc_freeall) (NCURSES_SP_DCL0)
                WINDOW *p_win = &(p->win);
                bool found = FALSE;
 
+#ifndef USE_SP_WINDOWLIST
+               if (p->screen != SP_PARM)
+                   continue;
+#endif
+
                for (each_window(SP_PARM, q)) {
                    WINDOW *q_win = &(q->win);
+
+#ifndef USE_SP_WINDOWLIST
+                   if (q->screen != SP_PARM)
+                       continue;
+#endif
+
                    if ((p != q)
                        && (q_win->_flags & _SUBWIN)
                        && (p_win == q_win->_parent)) {
@@ -134,10 +147,11 @@ _nc_freeall(void)
 NCURSES_EXPORT(void)
 NCURSES_SP_NAME(_nc_free_and_exit) (NCURSES_SP_DCLx int code)
 {
+    T((T_CALLED("_nc_free_and_exit(%d)"), code));
     NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
     NCURSES_SP_NAME(_nc_freeall) (NCURSES_SP_ARG);
 #ifdef TRACE
-    trace(0);                  /* close trace file, freeing its setbuf */
+    curses_trace(0);           /* close trace file, freeing its setbuf */
     {
        static va_list fake;
        free(_nc_varargs("?", fake));
@@ -146,7 +160,7 @@ NCURSES_SP_NAME(_nc_free_and_exit) (NCURSES_SP_DCLx int code)
     exit(code);
 }
 
-#else
+#else /* !HAVE_NC_FREEALL */
 NCURSES_EXPORT(void)
 _nc_freeall(void)
 {
@@ -162,7 +176,7 @@ NCURSES_SP_NAME(_nc_free_and_exit) (NCURSES_SP_DCLx int code)
     }
     exit(code);
 }
-#endif
+#endif /* HAVE_NC_FREEALL */
 
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(void)
@@ -171,3 +185,16 @@ _nc_free_and_exit(int code)
     NCURSES_SP_NAME(_nc_free_and_exit) (CURRENT_SCREEN, code);
 }
 #endif
+
+NCURSES_EXPORT(void)
+exit_curses(int code)
+{
+#if NO_LEAKS
+#if NCURSES_SP_FUNCS
+    NCURSES_SP_NAME(_nc_free_and_exit) (CURRENT_SCREEN, code);
+#else
+    _nc_free_and_exit(code);   /* deprecated... */
+#endif
+#endif
+    exit(code);
+}