X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=networking%2Fslattach.c;h=12a3067de219ad277f823c623282775f67d0efd8;hb=53f72bb3f0bd81b1d3af8939a16ec730c7e750c3;hp=1a4423b725af78bdd4bbd6edaa9d5f15c8c75c7a;hpb=fb79a2e2cfe33002398f1898c26d8e4f341db006;p=oweals%2Fbusybox.git

diff --git a/networking/slattach.c b/networking/slattach.c
index 1a4423b72..12a3067de 100644
--- a/networking/slattach.c
+++ b/networking/slattach.c
@@ -16,26 +16,16 @@
 #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;
 	struct termios saved_state;
-};
+} FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 #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)
 
 
 /*
@@ -53,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;
 
@@ -74,7 +64,7 @@ static int set_termios_state_and_warn(struct termios *state)
  * Go on after errors: we want to restore as many controlled ttys
  * as possible.
  */
-static void restore_state_and_exit(int exitcode) ATTRIBUTE_NORETURN;
+static void restore_state_and_exit(int exitcode) NORETURN;
 static void restore_state_and_exit(int exitcode)
 {
 	struct termios state;
@@ -88,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);
@@ -109,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;
@@ -120,18 +110,27 @@ static void set_state(struct termios *state, int encap)
 	/* Set encapsulation (SLIP, CSLIP, etc) */
 	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 UNUSED_PARAM)
 {
-	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 UNUSED_PARAM, 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";
@@ -153,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");
@@ -176,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 */
@@ -205,6 +206,8 @@ int slattach_main(int argc, char **argv)
 		state.c_cflag = CS8 | HUPCL | CREAD
 		              | ((opt & OPT_L_local) ? CLOCAL : 0)
 		              | ((opt & OPT_F_noflow) ? 0 : CRTSCTS);
+		cfsetispeed(&state, cfgetispeed(&saved_state));
+		cfsetospeed(&state, cfgetospeed(&saved_state));
 	}
 
 	if (opt & OPT_s_baud) {
@@ -238,5 +241,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);
 }