httpd: fix handling of range requests

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

diff --git a/networking/slattach.c b/networking/slattach.c
index d1221b11a7de1211810f123754f17ef7cd4b1a10..9267eb1d0f30da8763774ebcb099e5634f6dd505 100644 (file)
--- a/networking/slattach.c
+++ b/networking/slattach.c
@@ -12,12 +12,22 @@
  *
  * - The -F options allows disabling of RTS/CTS flow control.
  */
+//config:config SLATTACH
+//config:      bool "slattach"
+//config:      default y
+//config:      select PLATFORM_LINUX
+//config:      help
+//config:        slattach is a small utility to attach network interfaces to serial
+//config:        lines.
+
+//applet:IF_SLATTACH(APPLET(slattach, BB_DIR_SBIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_SLATTACH) += slattach.o
 
 //usage:#define slattach_trivial_usage
 //usage:       "[-cehmLF] [-s SPEED] [-p PROTOCOL] DEVICE"
 //usage:#define slattach_full_usage "\n\n"
 //usage:       "Attach network interface(s) to serial line(s)\n"
-//usage:     "\nOptions:"
 //usage:     "\n       -p PROT Set protocol (slip, cslip, slip6, clisp6 or adaptive)"
 //usage:     "\n       -s SPD  Set line speed"
 //usage:     "\n       -e      Exit after initializing device"
@@ -28,18 +38,19 @@
 //usage:     "\n       -F      Disable RTS/CTS flow control"
 
 #include "libbb.h"
-#include "libiproute/utils.h" /* invarg() */
+#include "common_bufsiz.h"
+#include "libiproute/utils.h" /* invarg_1_to_2() */
 
 struct globals {
        int handle;
        int saved_disc;
        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,7 +187,7 @@ int slattach_main(int argc UNUSED_PARAM, char **argv)
        encap = index_in_strings(proto_names, proto);
 
        if (encap < 0)
-               invarg(proto, "protocol");
+               invarg_1_to_2(proto, "protocol");
        if (encap > 3)
                encap = 8;
 
@@ -184,7 +195,7 @@ int slattach_main(int argc UNUSED_PARAM, char **argv)
        if (opt & OPT_s_baud) {
                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");
        }
 
        /* Trap signals in order to restore tty states upon exit */