Integrate unfix.org's IPv6 patches up to level 10, with rather a lot

[u/mdw/putty] / unix / pty.c

diff --git a/unix/pty.c b/unix/pty.c
index b9bd510..d99d4e5 100644 (file)
--- a/unix/pty.c
+++ b/unix/pty.c
@@ -621,18 +621,13 @@ static const char *pty_init(void *frontend, void **backend_handle, Config *cfg,
        /*
         * SIGINT and SIGQUIT may have been set to ignored by our
         * parent, particularly by things like sh -c 'pterm &' and
-        * some window managers. SIGCHLD, meanwhile, has been
-        * tinkered with by the watchdog process. Reverse all this
-        * for our child process.
+        * some window managers. SIGCHLD, meanwhile, was blocked
+        * during pt_main() startup. Reverse all this for our child
+        * process.
         */
        putty_signal(SIGINT, SIG_DFL);
        putty_signal(SIGQUIT, SIG_DFL);
-       {
-           sigset_t set;
-           sigemptyset(&set);
-           sigaddset(&set, SIGCHLD);
-           sigprocmask(SIG_UNBLOCK, &set, NULL);
-       }
+       block_signal(SIGCHLD, 0);
        if (pty_argv)
            execvp(pty_argv[0], pty_argv);
        else {
@@ -809,6 +804,11 @@ static int pty_exitcode(void *handle)
        return pty_exit_code;
 }
 
+static int pty_cfg_info(void *handle)
+{
+    return 0;
+}
+
 Backend pty_backend = {
     pty_init,
     pty_free,
@@ -825,5 +825,6 @@ Backend pty_backend = {
     pty_provide_ldisc,
     pty_provide_logctx,
     pty_unthrottle,
+    pty_cfg_info,
     1
 };