* Fix to tr so it recognizes standard escape sequences. Merged common

    escape seq. code from tr and echo into utility.c.  Fix thanks to
    Matt Kraai <kraai@alumni.carnegiemellon.edu>.
* This should close Bug #1015.  Please test.
 -Erik


git-svn-id: svn://busybox.net/trunk/busybox@737 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 5 insertions, 23 deletions

diff --git a/coreutils/echo.c b/coreutils/echo.c
index 4659e4bc6..6e279d1c6 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -40,7 +40,7 @@ extern int
 echo_main(int argc, char** argv)
 {
         register char **ap;
-        register char *p;
+        char *p;
         register char c;
         int nflag = 0;
         int eflag = 0;
@@ -65,28 +65,10 @@ echo_main(int argc, char** argv)
         while ((p = *ap++) != NULL) {
                 while ((c = *p++) != '\0') {
                         if (c == '\\' && eflag) {
-                                switch (c = *p++) {
-                                case 'a':  c = '\007'; break;
-                                case 'b':  c = '\b';  break;
-                                case 'c':  exit( 0);            /* exit */
-                                case 'f':  c = '\f';  break;
-                                case 'n':  c = '\n';  break;
-                                case 'r':  c = '\r';  break;
-                                case 't':  c = '\t';  break;
-                                case 'v':  c = '\v';  break;
-                                case '\\':  break;              /* c = '\\' */
-                                case '0': case '1': case '2': case '3':
-                                case '4': case '5': case '6': case '7':
-                                        c -= '0';
-                                        if (*p >= '0' && *p <= '7')
-                                                c = c * 8 + (*p++ - '0');
-                                        if (*p >= '0' && *p <= '7')
-                                        c = c * 8 + (*p++ - '0');
-                                        break;
-                                default:
-                                        p--;
-                                        break;
-                                }
+                                if (*p == 'c')
+                                        exit(0);
+                                else
+                                        c = process_escape_sequence(&p);
                         }
                         putchar(c);
                 }