aboutsummaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-07-01 10:40:41 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-07-01 10:40:41 +0000
commit3da5572bfa81a63ce66e41b99e9801c47a05bbbf (patch)
tree91e495d81283309948b9f459bbd65c17682431fa /networking
parent148f67af9dac56db4703fb40677630ef559edb57 (diff)
downloadbusybox-w32-3da5572bfa81a63ce66e41b99e9801c47a05bbbf.tar.gz
busybox-w32-3da5572bfa81a63ce66e41b99e9801c47a05bbbf.tar.bz2
busybox-w32-3da5572bfa81a63ce66e41b99e9801c47a05bbbf.zip
*: introduce and use xvfork()
function old new delta time_main 1052 1285 +233 crontab_main 623 856 +233 ifupdown_main 2202 2403 +201 xvfork - 20 +20 passwd_main 1049 1053 +4 grave 1068 1066 -2 script_main 935 921 -14 vfork_or_die 20 - -20 vfork_compressor 206 175 -31 open_as_user 109 - -109 popen2 218 - -218 edit_file 910 690 -220 run_command 268 - -268 ------------------------------------------------------------------------------ (add/remove: 1/4 grow/shrink: 4/4 up/down: 691/-882) Total: -191 bytes
Diffstat (limited to 'networking')
-rw-r--r--networking/ifupdown.c7
-rw-r--r--networking/sendmail.c11
2 files changed, 3 insertions, 15 deletions
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index c12391863..8caff3f4d 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -1008,12 +1008,9 @@ static int popen2(FILE **in, FILE **out, char *command, char *param)
1008 xpiped_pair(outfd); 1008 xpiped_pair(outfd);
1009 1009
1010 fflush(NULL); 1010 fflush(NULL);
1011 pid = vfork(); 1011 pid = xvfork();
1012 1012
1013 switch (pid) { 1013 if (pid == 0) { /* child */
1014 case -1: /* failure */
1015 bb_perror_msg_and_die("vfork");
1016 case 0: /* child */
1017 /* NB: close _first_, then move fds! */ 1014 /* NB: close _first_, then move fds! */
1018 close(infd.wr); 1015 close(infd.wr);
1019 close(outfd.rd); 1016 close(outfd.rd);
diff --git a/networking/sendmail.c b/networking/sendmail.c
index 1c23ca290..c195cc021 100644
--- a/networking/sendmail.c
+++ b/networking/sendmail.c
@@ -120,15 +120,6 @@ static void signal_handler(int signo)
120#undef err 120#undef err
121} 121}
122 122
123/* libbb candidate */
124static pid_t vfork_or_die(void)
125{
126 pid_t pid = vfork();
127 if (pid < 0)
128 bb_perror_msg_and_die("vfork");
129 return pid;
130}
131
132static void launch_helper(const char **argv) 123static void launch_helper(const char **argv)
133{ 124{
134 // setup vanilla unidirectional pipes interchange 125 // setup vanilla unidirectional pipes interchange
@@ -137,7 +128,7 @@ static void launch_helper(const char **argv)
137 128
138 xpipe(pipes); 129 xpipe(pipes);
139 xpipe(pipes+2); 130 xpipe(pipes+2);
140 helper_pid = vfork_or_die(); 131 helper_pid = xvfork();
141 idx = (!helper_pid) * 2; 132 idx = (!helper_pid) * 2;
142 xdup2(pipes[idx], STDIN_FILENO); 133 xdup2(pipes[idx], STDIN_FILENO);
143 xdup2(pipes[3-idx], STDOUT_FILENO); 134 xdup2(pipes[3-idx], STDOUT_FILENO);