From: markus schnalke Date: Thu, 22 Mar 2012 20:49:27 +0000 (+0100) Subject: Insourced push() into send. X-Git-Tag: mmh-thesis-end~227 X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=66ef547b1aa9794afb6137927aa3cd7335522c64;p=mmh Insourced push() into send. --- diff --git a/sbr/Makefile.in b/sbr/Makefile.in index 6dedfb1..82e7f53 100644 --- 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 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 -#include -#include - - -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 --- 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";