Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/networking/slattach.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/networking/slattach.c (modified) (11 diffs)

branches/2.2.9/mindi-busybox/networking/slattach.c

@@ -5 +5 @@
  * Author: Ignacio Garcia Perez (iggarpe at gmail dot com)
  *
- * License: GPLv2 or later, see LICENSE file in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * There are some differences from the standard net-tools slattach:
@@ -21 +21 @@
     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)
 
 
@@ -44 +44 @@
 }
 
-static int set_termios_state_and_warn(struct termios *state)
+static int set_termios_state_or_warn(struct termios *state)
 {
     int ret;
@@ -65 +65 @@
  * 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)
 {
@@ -79 +79 @@
     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)
@@ -100 +100 @@
 
     /* 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) */
@@ -111 +111 @@
     if (ioctl_or_warn(handle, SIOCSIFENCAP, &encap) < 0) {
  bad:
-        restore_state_and_exit(1);
-    }
-}
-
-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)
+        restore_state_and_exit(EXIT_FAILURE);
+    }
+}
+
+static void sig_handler(int signo UNUSED_PARAM)
+{
+    restore_state_and_exit(EXIT_SUCCESS);
+}
+
+int slattach_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int slattach_main(int argc UNUSED_PARAM, char **argv)
 {
     /* Line discipline code table */
@@ -135 +135 @@
     struct termios state;
     const char *proto = "cslip";
-    const char *extcmd;             /* Command to execute after hangup */
+    const char *extcmd;   /* Command to execute after hangup */
     const char *baud_str;
-    int baud_code = -1;             /* Line baud rate (system code) */
+    int baud_code = -1;   /* Line baud rate (system code) */
 
     enum {
@@ -176 +176 @@
     /* 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);
     }
 
@@ -205 +207 @@
                       | ((opt & OPT_L_local) ? CLOCAL : 0)
                       | ((opt & OPT_F_noflow) ? 0 : CRTSCTS);
+        cfsetispeed(&state, cfgetispeed(&saved_state));
+        cfsetospeed(&state, cfgetospeed(&saved_state));
     }
 
@@ -238 +242 @@
 
     /* Restore states and exit */
-    restore_state_and_exit(0);
-}
+    restore_state_and_exit(EXIT_SUCCESS);
+}