Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/slattach.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/networking/slattach.c (modified) (4 diffs)

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

@@ -28 +28 @@
 
 #include "libbb.h"
-#include "libiproute/utils.h" /* invarg() */
+#include "common_bufsiz.h"
+#include "libiproute/utils.h" /* invarg_1_to_2() */
 
 struct globals {
@@ -35 +36 @@
     struct termios saved_state;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#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 { setup_common_bufsiz(); } while (0)
 
 
@@ -176 +177 @@
 
     if (encap < 0)
-        invarg(proto, "protocol");
+        invarg_1_to_2(proto, "protocol");
     if (encap > 3)
         encap = 8;
@@ -184 +185 @@
         baud_code = tty_value_to_baud(xatoi(baud_str));
         if (baud_code < 0)
-            invarg(baud_str, "baud rate");
+            invarg_1_to_2(baud_str, "baud rate");
     }