httpd: fix handling of range requests

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

diff --git a/networking/slattach.c b/networking/slattach.c
index 52f7f3cffaa9ca632363cb62284425acbe6832de..9267eb1d0f30da8763774ebcb099e5634f6dd505 100644 (file)
--- a/networking/slattach.c
+++ b/networking/slattach.c
@@ -4,7 +4,7 @@
  *
  * 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:
  *
@@ -12,20 +12,45 @@
  *
  * - 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:     "\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"
+//usage:     "\n       -h      Exit when the carrier is lost"
+//usage:     "\n       -c PROG Run PROG when the line is hung up"
+//usage:     "\n       -m      Do NOT initialize the line in raw 8 bits mode"
+//usage:     "\n       -L      Enable 3-wire operation"
+//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;
-};
-#define G (*(struct globals*)&bb_common_bufsiz1)
+} 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 { setup_common_bufsiz(); } while (0)
 
 
 /*
@@ -134,9 +159,9 @@ int slattach_main(int argc UNUSED_PARAM, char **argv)
        int i, encap, opt;
        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 {
                OPT_p_proto  = 1 << 0,
@@ -162,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;
 
@@ -170,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 */
@@ -206,6 +231,8 @@ int slattach_main(int argc UNUSED_PARAM, 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) {