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

branches/3.3/mindi-busybox/miscutils/conspy.c

@@ -43 +43 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <sys/kd.h>
 
@@ -364 +365 @@
 {
     char tty_name[sizeof(DEV_TTY "NN")];
-#define keybuf bb_common_bufsiz1
     struct termios termbuf;
     unsigned opts;
@@ -383 +383 @@
     applet_long_options = getopt_longopts;
 #endif
+#define keybuf bb_common_bufsiz1
+    setup_common_bufsiz();
+
     INIT_G();
     strcpy(G.vcsa_name, DEV_VCSA);
@@ -514 +517 @@
             // Read the keys pressed
             k = keybuf + G.key_count;
-            bytes_read = read(G.kbd_fd, k, sizeof(keybuf) - G.key_count);
+            bytes_read = read(G.kbd_fd, k, COMMON_BUFSIZE - G.key_count);
             if (bytes_read < 0)
                 goto abort;