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

branches/3.3/mindi-busybox/coreutils/stty.c

@@ -33 +33 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #ifndef _POSIX_VDISABLE
@@ -247 +248 @@
 /* Which member(s) of 'struct termios' a mode uses */
 enum {
-    /* Do NOT change the order or values, as mode_type_flag()
-     * depends on them */
     control, input, output, local, combination
 };
+static tcflag_t *get_ptr_to_tcflag(unsigned type, const struct termios *mode)
+{
+    static const uint8_t tcflag_offsets[] ALIGN1 = {
+        offsetof(struct termios, c_cflag), /* control */
+        offsetof(struct termios, c_iflag), /* input */
+        offsetof(struct termios, c_oflag), /* output */
+        offsetof(struct termios, c_lflag)  /* local */
+    };
+    if (type <= local) {
+        return (tcflag_t*) (((char*)mode) + tcflag_offsets[type]);
+    }
+    return NULL;
+}
 
 /* Flags for 'struct mode_info' */
@@ -307 +319 @@
 
 /* Mode names given on command line */
-static const char mode_name[] =
+static const char mode_name[] ALIGN1 =
     MI_ENTRY("evenp",    combination, REV        | OMIT, 0,          0 )
     MI_ENTRY("parity",   combination, REV        | OMIT, 0,          0 )
@@ -670 +682 @@
 
 /* Name given on command line */
-static const char control_name[] =
+static const char control_name[] ALIGN1 =
     CI_ENTRY("intr",     CINTR,   VINTR   )
     CI_ENTRY("quit",     CQUIT,   VQUIT   )
@@ -712 +724 @@
 #define CI_ENTRY(n,s,o) { s, o },
 
-static const struct control_info control_info[] = {
+static const struct control_info control_info[] ALIGN2 = {
     /* This should be verbatim cut-n-paste copy of the above CI_ENTRYs */
     CI_ENTRY("intr",     CINTR,   VINTR   )
@@ -765 +777 @@
     char buf[10];
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
     G.device_name = bb_msg_standard_input; \
     G.max_col = 80; \
 } while (0)
-
-
-/* Return a string that is the printable representation of character CH */
-/* Adapted from 'cat' by Torbjorn Granlund */
-static const char *visible(unsigned ch)
-{
-    char *bpout = G.buf;
-
-    if (ch == _POSIX_VDISABLE)
-        return "<undef>";
-
-    if (ch >= 128) {
-        ch -= 128;
-        *bpout++ = 'M';
-        *bpout++ = '-';
-    }
-
-    if (ch < 32) {
-        *bpout++ = '^';
-        *bpout++ = ch + 64;
-    } else if (ch < 127) {
-        *bpout++ = ch;
-    } else {
-        *bpout++ = '^';
-        *bpout++ = '?';
-    }
-
-    *bpout = '\0';
-    return G.buf;
-}
-
-static tcflag_t *mode_type_flag(unsigned type, const struct termios *mode)
-{
-    static const uint8_t tcflag_offsets[] ALIGN1 = {
-        offsetof(struct termios, c_cflag), /* control */
-        offsetof(struct termios, c_iflag), /* input */
-        offsetof(struct termios, c_oflag), /* output */
-        offsetof(struct termios, c_lflag)  /* local */
-    };
-
-    if (type <= local) {
-        return (tcflag_t*) (((char*)mode) + tcflag_offsets[type]);
-    }
-    return NULL;
-}
 
 static void set_speed_or_die(enum speed_setting type, const char *arg,
@@ -1043 +1010 @@
 
     for (i = 0; i != CIDX_min; ++i) {
+        char ch;
         /* If swtch is the same as susp, don't print both */
 #if VSWTCH == VSUSP
@@ -1056 +1024 @@
         }
 #endif
-        wrapf("%s = %s;", nth_string(control_name, i),
-                visible(mode->c_cc[control_info[i].offset]));
+        ch = mode->c_cc[control_info[i].offset];
+        if (ch == _POSIX_VDISABLE)
+            strcpy(G.buf, "<undef>");
+        else
+            visible(ch, G.buf, 0);
+        wrapf("%s = %s;", nth_string(control_name, i), G.buf);
     }
 #if VEOF == VMIN
@@ -1073 +1045 @@
         }
 
-        bitsp = mode_type_flag(mode_info[i].type, mode);
+        bitsp = get_ptr_to_tcflag(mode_info[i].type, mode);
         mask = mode_info[i].mask ? mode_info[i].mask : mode_info[i].bits;
         if ((*bitsp & mask) == mode_info[i].bits) {
@@ -1092 +1064 @@
 {
     int i;
-    tcflag_t *bitsp;
 
     for (i = 0; i < NUM_control_info; ++i) {
@@ -1103 +1074 @@
 
     for (i = 0; i < NUM_mode_info; ++i) {
+        tcflag_t val;
+        tcflag_t *bitsp = get_ptr_to_tcflag(mode_info[i].type, mode);
+
+        if (!bitsp)
+            continue;
+        val = *bitsp & ~((unsigned long)mode_info[i].mask);
         if (mode_info[i].flags & SANE_SET) {
-            bitsp = mode_type_flag(mode_info[i].type, mode);
-            *bitsp = (*bitsp & ~((unsigned long)mode_info[i].mask))
-                | mode_info[i].bits;
-        } else if (mode_info[i].flags & SANE_UNSET) {
-            bitsp = mode_type_flag(mode_info[i].type, mode);
-            *bitsp = *bitsp & ~((unsigned long)mode_info[i].mask)
-                & ~mode_info[i].bits;
+            *bitsp = val | mode_info[i].bits;
+        } else
+        if (mode_info[i].flags & SANE_UNSET) {
+            *bitsp = val & ~mode_info[i].bits;
         }
     }
@@ -1120 +1094 @@
     tcflag_t *bitsp;
 
-    bitsp = mode_type_flag(info->type, mode);
+    bitsp = get_ptr_to_tcflag(info->type, mode);
 
     if (bitsp) {
+        tcflag_t val = *bitsp & ~info->mask;
         if (reversed)
-            *bitsp = *bitsp & ~info->mask & ~info->bits;
+            *bitsp = val & ~info->bits;
         else
-            *bitsp = (*bitsp & ~info->mask) | info->bits;
+            *bitsp = val | info->bits;
         return;
     }
 
-    /* Combination mode */
+    /* !bitsp - it's a "combination" mode */
     if (info == &mode_info[IDX_evenp] || info == &mode_info[IDX_parity]) {
         if (reversed)
@@ -1430 +1405 @@
 
     if (stty_state & (STTY_verbose_output | STTY_recoverable_output | STTY_noargs)) {
-        get_terminal_width_height(STDOUT_FILENO, &G.max_col, NULL);
+        G.max_col = get_terminal_width(STDOUT_FILENO);
         output_func(&mode, display_all);
         return EXIT_SUCCESS;
@@ -1535 +1510 @@
 
         if (memcmp(&mode, &new_mode, sizeof(mode)) != 0) {
-#if CIBAUD
+/*
+ * I think the below chunk is not necessary on Linux.
+ * If you are deleting it, also delete STTY_speed_was_set bit -
+ * it is only ever checked here.
+ */
+#if 0 /* was "if CIBAUD" */
             /* SunOS 4.1.3 (at least) has the problem that after this sequence,
                tcgetattr (&m1); tcsetattr (&m1); tcgetattr (&m2);