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

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

@@ -20 +20 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
+
+#define CATV_OPT_e (1<<0)
+#define CATV_OPT_t (1<<1)
+#define CATV_OPT_v (1<<2)
+struct BUG_const_mismatch {
+    char BUG_const_mismatch[
+        CATV_OPT_e == VISIBLE_ENDLINE && CATV_OPT_t == VISIBLE_SHOW_TABS
+        ? 1 : -1
+    ];
+};
 
 int catv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -26 +37 @@
     int retval = EXIT_SUCCESS;
     int fd;
-    unsigned flags;
-
-    flags = getopt32(argv, "etv");
-#define CATV_OPT_e (1<<0)
-#define CATV_OPT_t (1<<1)
-#define CATV_OPT_v (1<<2)
-    flags ^= CATV_OPT_v;
+    unsigned opts;
+    opts = getopt32(argv, "etv");
     argv += optind;
+#if 0 /* These consts match, we can just pass "opts" to visible() */
+    if (opts & CATV_OPT_e)
+        flags |= VISIBLE_ENDLINE;
+    if (opts & CATV_OPT_t)
+        flags |= VISIBLE_SHOW_TABS;
+#endif
 
     /* Read from stdin if there's nothing else to do. */
     if (!argv[0])
         *--argv = (char*)"-";
+
+#define read_buf bb_common_bufsiz1
+    setup_common_bufsiz();
     do {
         fd = open_or_warn_stdin(*argv);
@@ -47 +62 @@
             int i, res;
 
-#define read_buf bb_common_bufsiz1
             res = read(fd, read_buf, COMMON_BUFSIZE);
             if (res < 0)
                 retval = EXIT_FAILURE;
-            if (res < 1)
+            if (res <= 0)
                 break;
             for (i = 0; i < res; i++) {
                 unsigned char c = read_buf[i];
-
-                if (c > 126 && (flags & CATV_OPT_v)) {
-                    if (c == 127) {
-                        printf("^?");
-                        continue;
-                    }
-                    printf("M-");
-                    c -= 128;
+                if (opts & CATV_OPT_v) {
+                    putchar(c);
+                } else {
+                    char buf[sizeof("M-^c")];
+                    visible(c, buf, opts);
+                    fputs(buf, stdout);
                 }
-                if (c < 32) {
-                    if (c == 10) {
-                        if (flags & CATV_OPT_e)
-                            bb_putchar('$');
-                    } else if (flags & (c==9 ? CATV_OPT_t : CATV_OPT_v)) {
-                        printf("^%c", c+'@');
-                        continue;
-                    }
-                }
-                bb_putchar(c);
             }
         }