emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sendmail: document and fix usage of fd #4, fix check for helper failure.

Browse Source 
function                                             old     new   delta
packed_usage                                       25663   25694     +31
signal_handler                                       191     215     +24
kill_helper                                           22      31      +9
launch_helper                                        194     184     -10
get_cred_or_die                                      142     129     -13
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/2 up/down: 64/-23)             Total: 41 bytes
This commit is contained in:
Denis Vlasenko 2009-03-04 17:56:00 +00:00
parent 5a2ad699fc
commit 021de3f029
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/usage.h
View File

@ -3651,6 +3651,7 @@
"\n -H 'prog args' Run connection helper. E.g. openssl for encryption:" \ "\n -H 'prog args' Run connection helper. E.g. openssl for encryption:" \
"\n -H 'exec openssl s_client -quiet -tls1 -starttls smtp" \ "\n -H 'exec openssl s_client -quiet -tls1 -starttls smtp" \
"\n -connect smtp.gmail.com:25' <email.txt" \ "\n -connect smtp.gmail.com:25' <email.txt" \
"\n [4<username_and_passwd.txt]" \
"\n -S server[:port] Server" \ "\n -S server[:port] Server" \
) \ ) \
USE_FEATURE_SENDMAIL_MAILXX( \ USE_FEATURE_SENDMAIL_MAILXX( \

51
mailutils/mail.c
View File

@ -11,9 +11,10 @@
static void kill_helper(void) static void kill_helper(void)
{ {
// TODO!!!: is there more elegant way to terminate child on program failure? if (G.helper_pid > 0) {
if (G.helper_pid > 0)
kill(G.helper_pid, SIGTERM); kill(G.helper_pid, SIGTERM);
G.helper_pid = 0;
}
} }
// generic signal handler // generic signal handler
@ -26,44 +27,50 @@ static void signal_handler(int signo)
} }
// SIGCHLD. reap zombies // SIGCHLD. reap zombies
if (safe_waitpid(G.helper_pid, &err, WNOHANG) > 0) if (safe_waitpid(G.helper_pid, &err, WNOHANG) > 0) {
if (WIFSIGNALED(err))
bb_error_msg_and_die("helper killed by signal %u", WTERMSIG(err));
if (WIFEXITED(err)) { if (WIFEXITED(err)) {
G.helper_pid = 0; G.helper_pid = 0;
if (WEXITSTATUS(err)) if (WEXITSTATUS(err))
bb_error_msg_and_die("child exited (%d)", WEXITSTATUS(err)); bb_error_msg_and_die("helper exited (%u)", WEXITSTATUS(err));
} }
}
#undef err #undef err
} }
void FAST_FUNC launch_helper(const char **argv) void FAST_FUNC launch_helper(const char **argv)
{ {
// setup vanilla unidirectional pipes interchange // setup vanilla unidirectional pipes interchange
int idx; int i;
int pipes[4]; int pipes[4];
xpipe(pipes); xpipe(pipes);
xpipe(pipes+2); xpipe(pipes + 2);
G.helper_pid = vfork(); G.helper_pid = vfork();
if (G.helper_pid < 0) if (G.helper_pid < 0)
bb_perror_msg_and_die("vfork"); bb_perror_msg_and_die("vfork");
idx = (!G.helper_pid) * 2;
xdup2(pipes[idx], STDIN_FILENO); i = (!G.helper_pid) * 2; // for parent:0, for child:2
xdup2(pipes[3-idx], STDOUT_FILENO); close(pipes[i + 1]); // 1 or 3 - closing one write end
if (ENABLE_FEATURE_CLEAN_UP) close(pipes[2 - i]); // 2 or 0 - closing one read end
for (int i = 4; --i >= 0; ) xmove_fd(pipes[i], STDIN_FILENO); // 0 or 2 - using other read end
if (pipes[i] > STDOUT_FILENO) xmove_fd(pipes[3 - i], STDOUT_FILENO); // 3 or 1 - other write end
close(pipes[i]);
if (!G.helper_pid) { if (!G.helper_pid) {
// child: try to execute connection helper // child: try to execute connection helper
BB_EXECVP(*argv, (char **)argv); BB_EXECVP(*argv, (char **)argv);
_exit(127); _exit(127);
} }
// parent: check whether child is alive
// parent
bb_signals(0 bb_signals(0
+ (1 << SIGCHLD) + (1 << SIGCHLD)
+ (1 << SIGALRM) + (1 << SIGALRM)
, signal_handler); , signal_handler);
signal_handler(SIGCHLD); // check whether child is alive
//redundant:signal_handler(SIGCHLD);
// child seems OK -> parent goes on // child seems OK -> parent goes on
atexit(kill_helper); atexit(kill_helper);
} }
@ -226,17 +233,13 @@ void FAST_FUNC decode_base64(FILE *src_stream, FILE *dst_stream)
*/ */
void FAST_FUNC get_cred_or_die(int fd) void FAST_FUNC get_cred_or_die(int fd)
{ {
// either from TTY
if (isatty(fd)) { if (isatty(fd)) {
G.user = xstrdup(bb_ask_stdin("User: ")); G.user = xstrdup(bb_ask(fd, /* timeout: */ 0, "User: "));
G.pass = xstrdup(bb_ask_stdin("Password: ")); G.pass = xstrdup(bb_ask(fd, /* timeout: */ 0, "Password: "));
// or from STDIN
} else { } else {
FILE *fp = fdopen(fd, "r"); G.user = xmalloc_reads(fd, /* pfx: */ NULL, /* maxsize: */ NULL);
G.user = xmalloc_fgetline(fp); G.pass = xmalloc_reads(fd, /* pfx: */ NULL, /* maxsize: */ NULL);
G.pass = xmalloc_fgetline(fp);
fclose(fp);
} }
if (!G.user || !*G.user || !G.pass || !*G.pass) if (!G.user || !*G.user || !G.pass)
bb_error_msg_and_die("no username or password"); bb_error_msg_and_die("no username or password");
} }