sendmail: update from maintainer

[oweals/busybox.git] / networking / slattach.c

diff --git a/networking/slattach.c b/networking/slattach.c
index 3495df5988da15ada3ee6ed144da38d7e2daab43..1987eb39c31561cd58c5afc142fe2af29661a8b6 100644 (file)
--- a/networking/slattach.c
+++ b/networking/slattach.c
@@ -16,16 +16,6 @@
 #include "libbb.h"
 #include "libiproute/utils.h" /* invarg() */
 
-/* Line discipline code table */
-static const char *const proto_names[] = {
-       "cslip"+1,      /* 0 */
-       "cslip",        /* 1 */
-       "cslip6"+1,     /* 2 */
-       "cslip6",       /* 3 */
-       "adaptive",     /* 8 */
-       NULL
-};
-
 struct globals {
        int handle;
        int saved_disc;
@@ -50,11 +40,10 @@ static void save_state(void)
                bb_perror_msg_and_die("get state");
 
        /* Save line discipline */
-       if (ioctl(handle, TIOCGETD, &saved_disc) < 0)
-               bb_perror_msg_and_die("get discipline");
+       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;
 
@@ -81,8 +70,7 @@ static void restore_state_and_exit(int exitcode)
        struct termios state;
 
        /* Restore line discipline */
-       if (ioctl(handle, TIOCSETD, &saved_disc) < 0) {
-               bb_perror_msg("set discipline");
+       if (ioctl_or_warn(handle, TIOCSETD, &saved_disc) < 0) {
                exitcode = 1;
        }
 
@@ -90,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);
@@ -111,18 +99,16 @@ 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;
-       if (ioctl(handle, TIOCSETD, &disc) < 0) {
-               bb_perror_msg("set discipline");
+       if (ioctl_or_warn(handle, TIOCSETD, &disc) < 0) {
                goto bad;
        }
 
        /* Set encapsulation (SLIP, CSLIP, etc) */
-       if (ioctl(handle, SIOCSIFENCAP, &encap) < 0) {
-               bb_perror_msg("set encapsulation");
+       if (ioctl_or_warn(handle, SIOCSIFENCAP, &encap) < 0) {
  bad:
                restore_state_and_exit(1);
        }
@@ -133,9 +119,18 @@ static void sig_handler(int signo)
        restore_state_and_exit(0);
 }
 
-int slattach_main(int argc, char **argv);
+int slattach_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int slattach_main(int argc, char **argv)
 {
+       /* Line discipline code table */
+       static const char proto_names[] ALIGN1 =
+               "slip\0"        /* 0 */
+               "cslip\0"       /* 1 */
+               "slip6\0"       /* 2 */
+               "cslip6\0"      /* 3 */
+               "adaptive\0"    /* 8 */
+               ;
+
        int i, encap, opt;
        struct termios state;
        const char *proto = "cslip";
@@ -157,14 +152,14 @@ int slattach_main(int argc, char **argv)
        INIT_G();
 
        /* Parse command line options */
-       opt = getopt32(argc, argv, "p:s:c:ehmLF", &proto, &baud_str, &extcmd);
+       opt = getopt32(argv, "p:s:c:ehmLF", &proto, &baud_str, &extcmd);
        /*argc -= optind;*/
        argv += optind;
 
        if (!*argv)
                bb_show_usage();
 
-       encap = index_in_str_array(proto_names, proto);
+       encap = index_in_strings(proto_names, proto);
 
        if (encap < 0)
                invarg(proto, "protocol");
@@ -180,10 +175,12 @@ int slattach_main(int argc, char **argv)
 
        /* Trap signals in order to restore tty states upon exit */
        if (!(opt & OPT_e_quit)) {
-               signal(SIGHUP, sig_handler);
-               signal(SIGINT, sig_handler);
-               signal(SIGQUIT, sig_handler);
-               signal(SIGTERM, sig_handler);
+               bb_signals(0
+                       + (1 << SIGHUP)
+                       + (1 << SIGINT)
+                       + (1 << SIGQUIT)
+                       + (1 << SIGTERM)
+                       , sig_handler);
        }
 
        /* Open tty */