ncurses 6.1 - patch 20190504

[ncurses.git] / ncurses / tty / lib_tstp.c

diff --git a/ncurses/tty/lib_tstp.c b/ncurses/tty/lib_tstp.c
index 583ee0fdd5053d2fd06aa9375694ca092199870a..42d5ccb41522e068e7fc29cfdb18b5b07fbac26d 100644 (file)
--- a/ncurses/tty/lib_tstp.c
+++ b/ncurses/tty/lib_tstp.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2014,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            *


@@ -42,7 +42,7 @@
 
 #include <SigAction.h>
 
 
 #include <SigAction.h>
 

-MODULE_ID("$Id: lib_tstp.c,v 1.44 2011/06/25 21:22:16 tom Exp $")
+MODULE_ID("$Id: lib_tstp.c,v 1.49 2017/07/22 23:29:58 tom Exp $")

 
 #if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC)
 #define USE_SIGTSTP 1
 
 #if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC)
 #define USE_SIGTSTP 1


@@ -134,7 +134,7 @@ signal_name(int sig)
 
 #if USE_SIGTSTP
 static void
 
 #if USE_SIGTSTP
 static void

-tstp(int dummy GCC_UNUSED)
+handle_SIGTSTP(int dummy GCC_UNUSED)

 {
     SCREEN *sp = CURRENT_SCREEN;
     sigset_t mask, omask;
 {
     SCREEN *sp = CURRENT_SCREEN;
     sigset_t mask, omask;


@@ -144,7 +144,8 @@ tstp(int dummy GCC_UNUSED)
     int sigttou_blocked;
 #endif
 
     int sigttou_blocked;
 #endif
 

-    T(("tstp() called"));
+    _nc_globals.have_sigtstp = 1;
+    T(("handle_SIGTSTP() called"));

 
     /*
      * The user may have changed the prog_mode tty bits, so save them.
 
     /*
      * The user may have changed the prog_mode tty bits, so save them.


@@ -154,8 +155,10 @@ tstp(int dummy GCC_UNUSED)
      * taken ownership of the tty and modified the settings when our
      * parent was stopped before us, and we would likely pick up the
      * settings already modified by the shell.
      * taken ownership of the tty and modified the settings when our
      * parent was stopped before us, and we would likely pick up the
      * settings already modified by the shell.

+     *
+     * Don't do this if we're not in curses -

      */
      */

-    if (sp != 0 && !sp->_endwin)       /* don't do this if we're not in curses */
+    if (sp != 0 && (sp->_endwin == ewRunning))

 #if HAVE_TCGETPGRP
        if (tcgetpgrp(STDIN_FILENO) == getpgrp())
 #endif
 #if HAVE_TCGETPGRP
        if (tcgetpgrp(STDIN_FILENO) == getpgrp())
 #endif


@@ -235,7 +238,7 @@ tstp(int dummy GCC_UNUSED)
 #endif /* USE_SIGTSTP */
 
 static void
 #endif /* USE_SIGTSTP */
 
 static void

-cleanup(int sig)
+handle_SIGINT(int sig)

 {
     SCREEN *sp = CURRENT_SCREEN;
 
 {
     SCREEN *sp = CURRENT_SCREEN;
 


@@ -266,14 +269,13 @@ cleanup(int sig)
            SCREEN *scan;
            for (each_screen(scan)) {
                if (scan->_ofp != 0
            SCREEN *scan;
            for (each_screen(scan)) {
                if (scan->_ofp != 0

-                   && isatty(fileno(scan->_ofp))) {
-                   scan->_cleanup = TRUE;
+                   && NC_ISATTY(fileno(scan->_ofp))) {

                    scan->_outch = NCURSES_SP_NAME(_nc_outch);
                }
                set_term(scan);
                NCURSES_SP_NAME(endwin) (NCURSES_SP_ARG);
                if (sp)
                    scan->_outch = NCURSES_SP_NAME(_nc_outch);
                }
                set_term(scan);
                NCURSES_SP_NAME(endwin) (NCURSES_SP_ARG);
                if (sp)

-                   sp->_endwin = FALSE;        /* in case of reuse */
+                   sp->_endwin = ewInitial;    /* in case of reuse */

            }
        }
     }
            }
        }
     }


@@ -282,7 +284,7 @@ cleanup(int sig)
 
 #if USE_SIGWINCH
 static void
 
 #if USE_SIGWINCH
 static void

-sigwinch(int sig GCC_UNUSED)
+handle_SIGWINCH(int sig GCC_UNUSED)

 {
     _nc_globals.have_sigwinch = 1;
 # if USE_PTHREADS_EINTR
 {
     _nc_globals.have_sigwinch = 1;
 # if USE_PTHREADS_EINTR


@@ -300,7 +302,7 @@ sigwinch(int sig GCC_UNUSED)
  * handler.
  */
 static int
  * handler.
  */
 static int

-CatchIfDefault(int sig, RETSIGTYPE (*handler) (int))
+CatchIfDefault(int sig, void (*handler) (int))

 {
     int result;
 #if HAVE_SIGACTION || HAVE_SIGVEC
 {
     int result;
 #if HAVE_SIGACTION || HAVE_SIGVEC


@@ -330,7 +332,7 @@ CatchIfDefault(int sig, RETSIGTYPE (*handler) (int))
        result = FALSE;
     }
 #else /* !HAVE_SIGACTION */
        result = FALSE;
     }
 #else /* !HAVE_SIGACTION */

-    RETSIGTYPE (*ohandler) (int);
+    void (*ohandler) (int);

 
     ohandler = signal(sig, SIG_IGN);
     if (ohandler == SIG_DFL
 
     ohandler = signal(sig, SIG_IGN);
     if (ohandler == SIG_DFL


@@ -363,7 +365,7 @@ CatchIfDefault(int sig, RETSIGTYPE (*handler) (int))
  * the caller later changes its mind, but that doesn't seem correct.
  */
 NCURSES_EXPORT(void)
  * the caller later changes its mind, but that doesn't seem correct.
  */
 NCURSES_EXPORT(void)

-_nc_signal_handler(bool enable)
+_nc_signal_handler(int enable)

 {
     T((T_CALLED("_nc_signal_handler(%d)"), enable));
 #if USE_SIGTSTP                        /* Xenix 2.x doesn't have SIGTSTP, for example */
 {
     T((T_CALLED("_nc_signal_handler(%d)"), enable));
 #if USE_SIGTSTP                        /* Xenix 2.x doesn't have SIGTSTP, for example */


@@ -384,7 +386,7 @@ _nc_signal_handler(bool enable)
 #ifdef SA_RESTART
                new_sigaction.sa_flags |= SA_RESTART;
 #endif /* SA_RESTART */
 #ifdef SA_RESTART
                new_sigaction.sa_flags |= SA_RESTART;
 #endif /* SA_RESTART */

-               new_sigaction.sa_handler = tstp;
+               new_sigaction.sa_handler = handle_SIGTSTP;

                (void) sigaction(SIGTSTP, &new_sigaction, NULL);
            } else {
                ignore_tstp = TRUE;
                (void) sigaction(SIGTSTP, &new_sigaction, NULL);
            } else {
                ignore_tstp = TRUE;


@@ -395,10 +397,10 @@ _nc_signal_handler(bool enable)
 
     if (!_nc_globals.init_signals) {
        if (enable) {
 
     if (!_nc_globals.init_signals) {
        if (enable) {

-           CatchIfDefault(SIGINT, cleanup);
-           CatchIfDefault(SIGTERM, cleanup);
+           CatchIfDefault(SIGINT, handle_SIGINT);
+           CatchIfDefault(SIGTERM, handle_SIGINT);

 #if USE_SIGWINCH
 #if USE_SIGWINCH

-           CatchIfDefault(SIGWINCH, sigwinch);
+           CatchIfDefault(SIGWINCH, handle_SIGWINCH);

 #endif
            _nc_globals.init_signals = TRUE;
        }
 #endif
            _nc_globals.init_signals = TRUE;
        }