BSD 4_4 release

[unix-history] / usr / src / lib / libcurses / tstp.c

diff --git a/usr/src/lib/libcurses/tstp.c b/usr/src/lib/libcurses/tstp.c
index c79f6aa..a7670d0 100644 (file)
--- a/usr/src/lib/libcurses/tstp.c
+++ b/usr/src/lib/libcurses/tstp.c
@@ -1,12 +1,38 @@
 /*
 /*

- * Copyright (c) 1981 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1981, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)tstp.c     5.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)tstp.c     8.1 (Berkeley) 6/7/93";

 #endif /* not lint */
 
 #include <curses.h>
 #endif /* not lint */
 
 #include <curses.h>


@@ -15,6 +41,7 @@ static char sccsid[] = "@(#)tstp.c    5.8 (Berkeley) %G%";
 #include <termios.h>
 #include <unistd.h>
 
 #include <termios.h>
 #include <unistd.h>
 

+

 /*
  * stop_signal_handler --
  *     Handle stop signals.
 /*
  * stop_signal_handler --
  *     Handle stop signals.


@@ -26,7 +53,7 @@ __stop_signal_handler(signo)
        struct termios save;
        sigset_t oset, set;
 
        struct termios save;
        sigset_t oset, set;
 

-       /* Get the current terminal state. */
+       /* Get the current terminal state (which the user may have changed). */

        if (tcgetattr(STDIN_FILENO, &save))
                return;
 
        if (tcgetattr(STDIN_FILENO, &save))
                return;
 


@@ -50,16 +77,20 @@ __stop_signal_handler(signo)
        (void)sigprocmask(SIG_UNBLOCK, &set, NULL);
 
        /* Stop ourselves. */
        (void)sigprocmask(SIG_UNBLOCK, &set, NULL);
 
        /* Stop ourselves. */

-       (void)signal(SIGTSTP, SIG_DFL);
+       __restore_stophandler();

        (void)kill(0, SIGTSTP);
 
        /* Time passes ... */
 
        /* Reset the curses SIGTSTP signal handler. */
        (void)kill(0, SIGTSTP);
 
        /* Time passes ... */
 
        /* Reset the curses SIGTSTP signal handler. */

-       (void)signal(SIGTSTP, __stop_signal_handler);
+       __set_stophandler();

 
 

-       /* Reset the terminal state its mode when we stopped. */
-       (void)tcsetattr(STDIN_FILENO, TCSADRAIN, &save);
+       /* save the new "default" terminal state */
+       (void)tcgetattr(STDIN_FILENO, &__orig_termios);
+
+       /* Reset the terminal state to the mode just before we stopped. */
+       (void)tcsetattr(STDIN_FILENO, __tcaction ?
+           TCSASOFT | TCSADRAIN : TCSADRAIN, &save);

 
        /* Restart the screen. */
        __startwin();
 
        /* Restart the screen. */
        __startwin();


@@ -70,3 +101,23 @@ __stop_signal_handler(signo)
        /* Reset the signals. */
        (void)sigprocmask(SIG_SETMASK, &oset, NULL);
 }
        /* Reset the signals. */
        (void)sigprocmask(SIG_SETMASK, &oset, NULL);
 }

+
+static void (*otstpfn)() = SIG_DFL;
+
+/*
+ * Set the TSTP handler.
+ */
+void
+__set_stophandler()
+{
+       otstpfn = signal(SIGTSTP, __stop_signal_handler);
+}
+
+/*
+ * Restore the TSTP handler.
+ */
+void
+__restore_stophandler()
+{
+       (void)signal(SIGTSTP, otstpfn);
+}