Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/telnet.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/telnet.c (modified) (7 diffs)

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

@@ -40 +40 @@
 #include <netinet/in.h>
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #ifdef __BIONIC__
@@ -109 +110 @@
     struct termios termios_raw;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
-    struct G_sizecheck { \
-        char G_sizecheck[sizeof(G) > COMMON_BUFSIZE ? -1 : 1]; \
-    }; \
+    setup_common_bufsiz(); \
+    BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
 } while (0)
 
@@ -126 +126 @@
 static void iac_flush(void)
 {
-    write(netfd, G.iacbuf, G.iaclen);
+    full_write(netfd, G.iacbuf, G.iaclen);
     G.iaclen = 0;
 }
-
-#define write_str(fd, str) write(fd, str, sizeof(str) - 1)
 
 static void doexit(int ev) NORETURN;
@@ -146 +144 @@
         rawmode();
 
-    write_str(1, "\r\nConsole escape. Commands are:\r\n\n"
+    full_write1_str("\r\nConsole escape. Commands are:\r\n\n"
             " l go to line mode\r\n"
             " c go to character mode\r\n"
@@ -177 +175 @@
     }
 
-    write_str(1, "continuing...\r\n");
+    full_write1_str("continuing...\r\n");
 
     if (bb_got_signal)
@@ -384 +382 @@
     put_iac(c);
 
-    put_iac((x >> 8) & 0xff);
-    put_iac(x & 0xff);
-    put_iac((y >> 8) & 0xff);
-    put_iac(y & 0xff);
+    /* "... & 0xff" implicitly done below */
+    put_iac(x >> 8);
+    put_iac(x);
+    put_iac(y >> 8);
+    put_iac(y);
 
     put_iac(IAC);
@@ -625 +624 @@
     xmove_fd(create_and_connect_stream_or_die(host, port), netfd);
 
-    setsockopt(netfd, SOL_SOCKET, SO_KEEPALIVE, &const_int_1, sizeof(const_int_1));
+    setsockopt_keepalive(netfd);
 
     signal(SIGINT, record_signo);