Insourced push() into send.

diff --git a/sbr/Makefile.in b/sbr/Makefile.in
index 6dedfb1..82e7f53 100644 (file)
--- a/sbr/Makefile.in
+++ b/sbr/Makefile.in
@@ -61,7 +61,7 @@ SRCS = addrsbr.c ambigsw.c atooi.c brkstring.c  \
        m_name.c \
        makedir.c mts.c norm_charmap.c  \
        path.c peekc.c pidwait.c pidstatus.c  \
-       print_help.c print_sw.c print_version.c push.c  \
+       print_help.c print_sw.c print_version.c \
        putenv.c refile.c mhbasename.c  \
        readconfig.c ruserpass.c seq_add.c seq_bits.c  \
        seq_del.c seq_getnum.c seq_list.c seq_nameok.c  \

diff --git a/sbr/push.c b/sbr/push.c
deleted file mode 100644 (file)
index eb6011a..0000000
--- a/sbr/push.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-** push.c -- push a fork into the background
-**
-** This code is Copyright (c) 2002, by the authors of nmh.  See the
-** COPYRIGHT file in the root directory of the nmh distribution for
-** complete copyright information.
-*/
-
-#include <h/mh.h>
-#include <h/signals.h>
-#include <signal.h>
-
-
-void
-push(void)
-{
-       pid_t pid;
-
-       switch (pid = fork()) {
-       case -1:
-               /* fork error */
-               advise(NULL, "unable to fork, so can't push...");
-               break;
-
-       case 0:
-               /* child, block a few signals and continue */
-               SIGNAL(SIGHUP, SIG_IGN);
-               SIGNAL(SIGINT, SIG_IGN);
-               SIGNAL(SIGQUIT, SIG_IGN);
-               SIGNAL(SIGTERM, SIG_IGN);
-#ifdef SIGTSTP
-               SIGNAL(SIGTSTP, SIG_IGN);
-               SIGNAL(SIGTTIN, SIG_IGN);
-               SIGNAL(SIGTTOU, SIG_IGN);
-#endif
-               freopen("/dev/null", "r", stdin);
-               freopen("/dev/null", "w", stdout);
-               break;
-
-       default:
-               /* parent, just exit */
-               done(0);
-       }
-}

diff --git a/uip/send.c b/uip/send.c
index d87e211..5054273 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -273,7 +273,34 @@ main(int argc, char **argv)
                st.st_ino = 0;
        }
        if (pushsw) {
-               push();
+               /* push a fork into the background */
+               pid_t pid;
+
+               switch (pid = fork()) {
+               case -1:
+                       /* fork error */
+                       advise(NULL, "unable to fork, so can't push...");
+                       break;
+
+               default:
+                       /* parent, just exit */
+                       done(0);
+
+               case 0:
+                       /* child, block a few signals and continue */
+                       SIGNAL(SIGHUP, SIG_IGN);
+                       SIGNAL(SIGINT, SIG_IGN);
+                       SIGNAL(SIGQUIT, SIG_IGN);
+                       SIGNAL(SIGTERM, SIG_IGN);
+#ifdef SIGTSTP
+                       SIGNAL(SIGTSTP, SIG_IGN);
+                       SIGNAL(SIGTTIN, SIG_IGN);
+                       SIGNAL(SIGTTOU, SIG_IGN);
+#endif
+                       freopen("/dev/null", "r", stdin);
+                       freopen("/dev/null", "w", stdout);
+                       break;
+               }
        }
        status = 0;
        vec[0] = "spost";