*: introduce and use xfork()

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

diff --git a/networking/slattach.c b/networking/slattach.c
index 1c00fddb6eba60398db3273f78ae629e49fdc2ae..02ecb5e9fc87f5f2f28b755ce670f9336716afcc 100644 (file)
--- a/networking/slattach.c
+++ b/networking/slattach.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Stripped down version of net-tools for busybox.
  *
@@ -13,16 +14,7 @@
  */
 
 #include "libbb.h"
-
-/* Line discipline code table */
-static const char *const proto_names[] = {
-       "slip",         /* 0 */
-       "cslip",        /* 1 */
-       "slip6",        /* 2 */
-       "cslip6",       /* 3 */
-       "adaptive",     /* 8 */
-       NULL
-};
+#include "libiproute/utils.h" /* invarg() */
 
 struct globals {
        int handle;
@@ -33,7 +25,7 @@ struct globals {
 #define handle       (G.handle      )
 #define saved_disc   (G.saved_disc  )
 #define saved_state  (G.saved_state )
-#define INIT_G() do {} while (0)
+#define INIT_G() do { } while (0)
 
 
 /*
@@ -48,8 +40,19 @@ 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_or_warn(struct termios *state)
+{
+       int ret;
+
+       ret = tcsetattr(handle, TCSANOW, state);
+       if (ret < 0) {
+               bb_perror_msg("set state");
+               return 1; /* used as exitcode */
+       }
+       return 0;
 }
 
 /*
@@ -67,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;
        }
 
@@ -76,18 +78,13 @@ static void restore_state_and_exit(int exitcode)
        memcpy(&state, &saved_state, sizeof(state));
        cfsetispeed(&state, B0);
        cfsetospeed(&state, B0);
-       if (tcsetattr(handle, TCSANOW, &state) < 0) {
-               bb_perror_msg("set state");
+       if (set_termios_state_or_warn(&state))
                exitcode = 1;
-       }
-
        sleep(1);
 
        /* Restore line status */
-       if (tcsetattr(handle, TCSANOW, &saved_state) < 0) {
-               bb_perror_msg_and_die("set state");
-       }
-
+       if (set_termios_state_or_warn(&saved_state))
+               exit(EXIT_FAILURE);
        if (ENABLE_FEATURE_CLEAN_UP)
                close(handle);
 
@@ -102,34 +99,38 @@ static void set_state(struct termios *state, int encap)
        int disc;
 
        /* Set line status */
-       if (tcsetattr(handle, TCSANOW, state) < 0) {
-               bb_perror_msg("set 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);
+               restore_state_and_exit(EXIT_FAILURE);
        }
 }
 
-static void sig_handler(int signo)
+static void sig_handler(int signo ATTRIBUTE_UNUSED)
 {
-       restore_state_and_exit(0);
+       restore_state_and_exit(EXIT_SUCCESS);
 }
 
-int slattach_main(int argc, char **argv);
-int slattach_main(int argc, char **argv)
+int slattach_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int slattach_main(int argc ATTRIBUTE_UNUSED, 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";
@@ -145,23 +146,23 @@ int slattach_main(int argc, char **argv)
                OPT_h_watch  = 1 << 4,
                OPT_m_nonraw = 1 << 5,
                OPT_L_local  = 1 << 6,
-               OPT_F_noflow = 1 << 7,
+               OPT_F_noflow = 1 << 7
        };
 
        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)
-               bb_error_msg_and_die("invalid protocol %s", proto);
+               invarg(proto, "protocol");
        if (encap > 3)
                encap = 8;
 
@@ -169,21 +170,23 @@ int slattach_main(int argc, char **argv)
        if (opt & OPT_s_baud) {
                baud_code = tty_value_to_baud(xatoi(baud_str));
                if (baud_code < 0)
-                       bb_error_msg_and_die("invalid baud rate");
+                       invarg(baud_str, "baud rate");
        }
 
        /* 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 */ 
+       /* Open tty */
        handle = open(*argv, O_RDWR | O_NDELAY);
        if (handle < 0) {
-               char *buf = xasprintf("/dev/%s", *argv);
+               char *buf = concat_path_file("/dev", *argv);
                handle = xopen(buf, O_RDWR | O_NDELAY);
                /* maybe if (ENABLE_FEATURE_CLEAN_UP) ?? */
                free(buf);
@@ -192,7 +195,7 @@ int slattach_main(int argc, char **argv)
        /* Save current tty state */
        save_state();
 
-       /* Confgure tty */
+       /* Configure tty */
        memcpy(&state, &saved_state, sizeof(state));
        if (!(opt & OPT_m_nonraw)) { /* raw not suppressed */
                memset(&state.c_cc, 0, sizeof(state.c_cc));
@@ -217,7 +220,7 @@ int slattach_main(int argc, char **argv)
                return 0;
 
        /* If we're not requested to watch, just keep descriptor open
-        * till we are killed */
+        * until we are killed */
        if (!(opt & OPT_h_watch))
                while (1)
                        sleep(24*60*60);
@@ -236,5 +239,5 @@ int slattach_main(int argc, char **argv)
                system(extcmd);
 
        /* Restore states and exit */
-       restore_state_and_exit(0);
+       restore_state_and_exit(EXIT_SUCCESS);
 }