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

less,klogd,syslogd,nc,tcpudp: exit on signal by killing itself, not exit(1)

Browse Source 
*: minor shrink
This commit is contained in:
Denis Vlasenko
2008-02-24 13:36:01 +00:00
parent d553faf5a5
commit 400d8bb45e
14 changed files with 68 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
networking/inetd.c
View File

@@ -1327,7 +1327,7 @@ int inetd_main(int argc, char **argv)
}
memset((char *) &sa, 0, sizeof(sa));
sigemptyset(&sa.sa_mask);
/*sigemptyset(&sa.sa_mask); - memset did it */
sigaddset(&sa.sa_mask, SIGALRM);
sigaddset(&sa.sa_mask, SIGCHLD);
sigaddset(&sa.sa_mask, SIGHUP);

2
networking/nc_bloaty.c
View File

@@ -163,7 +163,7 @@ static void catch(int sig)
if (o_verbose > 1) /* normally we don't care */
fprintf(stderr, SENT_N_RECV_M, wrote_net, wrote_out);
fprintf(stderr, "punt!\n");
exit(1);
kill_myself_with_sig(sig);
}
/* unarm */

8
networking/slattach.c
View File

@@ -43,7 +43,7 @@ static void save_state(void)
xioctl(handle, TIOCGETD, &saved_disc);
}
static int set_termios_state_and_warn(struct termios *state)
static int set_termios_state_or_warn(struct termios *state)
{
int ret;
@@ -78,12 +78,12 @@ static void restore_state_and_exit(int exitcode)
memcpy(&state, &saved_state, sizeof(state));
cfsetispeed(&state, B0);
cfsetospeed(&state, B0);
if (set_termios_state_and_warn(&state))
if (set_termios_state_or_warn(&state))
exitcode = 1;
sleep(1);
/* Restore line status */
if (set_termios_state_and_warn(&saved_state))
if (set_termios_state_or_warn(&saved_state))
exit(EXIT_FAILURE);
if (ENABLE_FEATURE_CLEAN_UP)
close(handle);
@@ -99,7 +99,7 @@ static void set_state(struct termios *state, int encap)
int disc;
/* Set line status */
if (set_termios_state_and_warn(state))
if (set_termios_state_or_warn(state))
goto bad;
/* Set line discliple (N_SLIP always) */
disc = N_SLIP;