Bump to version 1.22.1

[platform/upstream/busybox.git] / coreutils / catv.c

diff --git a/coreutils/catv.c b/coreutils/catv.c
index 55656b4..e3499c5 100644 (file)
--- a/coreutils/catv.c
+++ b/coreutils/catv.c
@@ -4,66 +4,77 @@
  *
  * Copyright (C) 2006 Rob Landley <rob@landley.net>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* See "Cat -v considered harmful" at
  * http://cm.bell-labs.com/cm/cs/doc/84/kp.ps.gz */
 
-#include "busybox.h"
+//usage:#define catv_trivial_usage
+//usage:       "[-etv] [FILE]..."
+//usage:#define catv_full_usage "\n\n"
+//usage:       "Display nonprinting characters as ^x or M-x\n"
+//usage:     "\n       -e      End each line with $"
+//usage:     "\n       -t      Show tabs as ^I"
+//usage:     "\n       -v      Don't use ^x or M-x escapes"
 
-int catv_main(int argc, char **argv)
-{
-       int retval = EXIT_SUCCESS, fd;
-       unsigned long flags;
+#include "libbb.h"
 
-       flags = getopt32(argc, argv, "etv");
+int catv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int catv_main(int argc UNUSED_PARAM, char **argv)
+{
+       int retval = EXIT_SUCCESS;
+       int fd;
+       unsigned opts;
 #define CATV_OPT_e (1<<0)
 #define CATV_OPT_t (1<<1)
 #define CATV_OPT_v (1<<2)
-       flags ^= CATV_OPT_v;
+       typedef char BUG_const_mismatch[
+               CATV_OPT_e == VISIBLE_ENDLINE && CATV_OPT_t == VISIBLE_SHOW_TABS
+               ? 1 : -1
+       ];
 
+       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*)"-";
        do {
-               /* Read from stdin if there's nothing else to do. */
-               fd = 0;
-               if (*argv && 0 > (fd = xopen(*argv, O_RDONLY)))
+               fd = open_or_warn_stdin(*argv);
+               if (fd < 0) {
                        retval = EXIT_FAILURE;
-               else for (;;) {
+                       continue;
+               }
+               for (;;) {
                        int i, res;
 
-                       res = read(fd, bb_common_bufsiz1, sizeof(bb_common_bufsiz1));
+#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++) {
-                               char c = bb_common_bufsiz1[i];
-
-                               if (c > 126 && (flags & CATV_OPT_v)) {
-                                       if (c == 127) {
-                                               bb_printf("^?");
-                                               continue;
-                                       } else {
-                                               bb_printf("M-");
-                                               c -= 128;
-                                       }
-                               }
-                               if (c < 32) {
-                                       if (c == 10) {
-                                          if (flags & CATV_OPT_e)
-                                                  putchar('$');
-                                       } else if (flags & (c==9 ? CATV_OPT_t : CATV_OPT_v)) {
-                                               bb_printf("^%c", c+'@');
-                                               continue;
-                                       }
+                               unsigned char c = read_buf[i];
+                               if (opts & CATV_OPT_v) {
+                                       putchar(c);
+                               } else {
+                                       char buf[sizeof("M-^c")];
+                                       visible(c, buf, opts);
+                                       fputs(buf, stdout);
                                }
-                               putchar(c);
                        }
                }
                if (ENABLE_FEATURE_CLEAN_UP && fd)
                        close(fd);
        } while (*++argv);
 
-       return retval;
+       fflush_stdout_and_exit(retval);
 }