Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/echo.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/coreutils/echo.c (modified) (2 diffs)

branches/2.2.5/mindi-busybox/coreutils/echo.c

@@ -21 +21 @@
  *     trailing newline.  SUSv3 specifies _no_ output after '\c'.
  * 2) SUSv3 specifies that octal escapes are of the form \0{#{#{#}}}.
- *    The previous version version did not allow 4-digit octals.
+ *    The previous version did not allow 4-digit octals.
  */
 
+#include "libbb.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include "busybox.h"
-
-int bb_echo(int ATTRIBUTE_UNUSED argc, char **argv)
+int bb_echo(char **argv)
 {
-#ifndef CONFIG_FEATURE_FANCY_ECHO
-#define eflag '\\'
-    ++argv;
+    const char *arg;
+#if !ENABLE_FEATURE_FANCY_ECHO
+    enum {
+        eflag = '\\',
+        nflag = 1,  /* 1 -- print '\n' */
+    };
+    arg = *++argv;
+    if (!arg)
+        goto newline_ret;
 #else
     const char *p;
-    int nflag = 1;
-    int eflag = 0;
+    char nflag = 1;
+    char eflag = 0;
 
-    while (*++argv && (**argv == '-')) {
+    while (1) {
+        arg = *++argv;
+        if (!arg)
+            goto newline_ret;
+        if (*arg != '-')
+            break;
+
         /* If it appears that we are handling options, then make sure
          * that all of the options specified are actually valid.
          * Otherwise, the string should just be echoed.
          */
-
-        if (!*(p = *argv + 1)) {    /* A single '-', so echo it. */
+        p = arg + 1;
+        if (!*p)    /* A single '-', so echo it. */
             goto just_echo;
-        }
 
         do {
-            if (strrchr("neE", *p) == 0) {
+            if (!strrchr("neE", *p))
                 goto just_echo;
-            }
         } while (*++p);
 
         /* All of the options in this arg are valid, so handle them. */
-        p = *argv + 1;
+        p = arg + 1;
         do {
-            if (*p == 'n') {
+            if (*p == 'n')
                 nflag = 0;
-            } else if (*p == 'e') {
+            if (*p == 'e')
                 eflag = '\\';
-            } else {
-                eflag = 0;
-            }
         } while (*++p);
     }
+ just_echo:
+#endif
+    while (1) {
+        /* arg is already == *argv and isn't NULL */
+        int c;
 
-just_echo:
-#endif
-    while (*argv) {
-        register int c;
-
-        while ((c = *(*argv)++)) {
+        if (!eflag) {
+            /* optimization for very common case */
+            fputs(arg, stdout);
+        } else while ((c = *arg++)) {
             if (c == eflag) {   /* Check for escape seq. */
-                if (**argv == 'c') {
+                if (*arg == 'c') {
                     /* '\c' means cancel newline and
                      * ignore all subsequent chars. */
-                    return 0;
+                    goto ret;
                 }
-#ifndef CONFIG_FEATURE_FANCY_ECHO
+#if !ENABLE_FEATURE_FANCY_ECHO
                 /* SUSv3 specifies that octal escapes must begin with '0'. */
-                if (((unsigned int)(**argv - '1')) >= 7)
+                if ( (((unsigned char)*arg) - '1') >= 7)
 #endif
                 {
                     /* Since SUSv3 mandates a first digit of 0, 4-digit octals
                     * of the form \0### are accepted. */
-                    if ((**argv == '0') && (((unsigned int)(argv[0][1] - '0')) < 8)) {
-                        (*argv)++;
+                    if (*arg == '0' && ((unsigned char)(arg[1]) - '0') < 8) {
+                        arg++;
                     }
                     /* bb_process_escape_sequence can handle nul correctly */
-                    c = bb_process_escape_sequence((const char **) argv);
+                    c = bb_process_escape_sequence(&arg);
                 }
             }
@@ -98 +104 @@
         }
 
-        if (*++argv) {
-            putchar(' ');
-        }
+        arg = *++argv;
+        if (!arg)
+            break;
+        putchar(' ');
     }
 
-#ifdef CONFIG_FEATURE_FANCY_ECHO
+ newline_ret:
     if (nflag) {
         putchar('\n');
     }
-#else
-    putchar('\n');
-#endif
-    return 0;
+ ret:
+    return fflush(stdout);
 }
 
+/* This is a NOFORK applet. Be very careful! */
+
+int echo_main(int argc, char** argv);
 int echo_main(int argc, char** argv)
 {
-    (void)bb_echo(argc, argv);
-    bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+    return bb_echo(argv);
 }