a bit more IPv6-ization work

[oweals/busybox.git] / coreutils / catv.c

diff --git a/coreutils/catv.c b/coreutils/catv.c
index e182039155e861b039c5153cfca3aba204aadb28..66f30693a980ca1b6ea801979ff463a4f26b6c80 100644 (file)
--- a/coreutils/catv.c
+++ b/coreutils/catv.c
@@ -14,29 +14,33 @@
 
 int catv_main(int argc, char **argv)
 {
-       int retval = EXIT_SUCCESS, fd, flags;
+       int retval = EXIT_SUCCESS, fd;
+       unsigned flags;
 
-       flags = bb_getopt_ulflags(argc, argv, "etv");
-       flags ^= 4;
-
-       // Loop through files.
+       flags = getopt32(argc, argv, "etv");
+#define CATV_OPT_e (1<<0)
+#define CATV_OPT_t (1<<1)
+#define CATV_OPT_v (1<<2)
+       flags ^= CATV_OPT_v;
 
        argv += optind;
        do {
-               // Read from stdin if there's nothing else to do.
-
+               /* Read from stdin if there's nothing else to do. */
                fd = 0;
-               if (*argv && 0>(fd = xopen(*argv, O_RDONLY))) retval = EXIT_FAILURE;
-               else for(;;) {
+               if (*argv && 0 > (fd = xopen(*argv, O_RDONLY)))
+                       retval = EXIT_FAILURE;
+               else for (;;) {
                        int i, res;
 
                        res = read(fd, bb_common_bufsiz1, sizeof(bb_common_bufsiz1));
-                       if (res < 0) retval = EXIT_FAILURE;
-                       if (res <1) break;
-                       for (i=0; i<res; i++) {
-                               char c=bb_common_bufsiz1[i];
+                       if (res < 0)
+                               retval = EXIT_FAILURE;
+                       if (res < 1)
+                               break;
+                       for (i = 0; i < res; i++) {
+                               char c = bb_common_bufsiz1[i];
 
-                               if (c > 126 && (flags & 4)) {
+                               if (c > 126 && (flags & CATV_OPT_v)) {
                                        if (c == 127) {
                                                printf("^?");
                                                continue;
@@ -47,8 +51,9 @@ int catv_main(int argc, char **argv)
                                }
                                if (c < 32) {
                                        if (c == 10) {
-                                          if (flags & 1) putchar('$');
-                                       } else if (flags & (c==9 ? 2 : 4)) {
+                                               if (flags & CATV_OPT_e)
+                                                       putchar('$');
+                                       } else if (flags & (c==9 ? CATV_OPT_t : CATV_OPT_v)) {
                                                printf("^%c", c+'@');
                                                continue;
                                        }
@@ -56,8 +61,9 @@ int catv_main(int argc, char **argv)
                                putchar(c);
                        }
                }
-               if (ENABLE_FEATURE_CLEAN_UP && fd) close(fd);
+               if (ENABLE_FEATURE_CLEAN_UP && fd)
+                       close(fd);
        } while (*++argv);
 
-       return retval;
+       fflush_stdout_and_exit(retval);
 }