Patch from vodz:

[oweals/busybox.git] / libbb / process_escape_sequence.c

diff --git a/libbb/process_escape_sequence.c b/libbb/process_escape_sequence.c
index ad2be94ee23e56776e0bf0505e7dd798b9512dfd..ef2717bdd62fde1fa8a93dbb04f5efd4440c551d 100644 (file)
--- a/libbb/process_escape_sequence.c
+++ b/libbb/process_escape_sequence.c
@@ -2,9 +2,8 @@
 /*
  * Utility routines.
  *
- * Copyright (C) tons of folks.  Tracking down who wrote what
- * isn't something I'm going to worry about...  If you wrote something
- * here, please feel free to acknowledge your work.
+ * Copyright (C) Manuel Novoa III <mjn3@codepoet.org>
+ * and Vladimir Oleynik <dzo@simtreas.ru>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,59 +19,58 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
- * Based in part on code from sash, Copyright (c) 1999 by David I. Bell 
- * Permission has been granted to redistribute this code under the GPL.
- *
+ * 
  */
 
 #include <stdio.h>
 #include <limits.h>
 #include "libbb.h"
 
-
-
-char process_escape_sequence(char **ptr)
+char bb_process_escape_sequence(const char **ptr)
 {
-       static const char charmap[] = {
-                  'a',  'b',  'f',  'n',  'r',  't',  'v',  '\\', 0,
-              '\a', '\b', '\f', '\n', '\r', '\t', '\v', '\\', '\\' };
+       static const char charmap[] = {
+               'a',  'b',  'f',  'n',  'r',  't',  'v',  '\\', 0,
+               '\a', '\b', '\f', '\n', '\r', '\t', '\v', '\\', '\\' };
 
-       const char *p;
-          char *q;
-       int num_digits;
-       unsigned int n;
+       const char *p;
+       const char *q;
+       unsigned int num_digits;
+       unsigned int r;
+       unsigned int n;
+       
+       n = 0;
+       q = *ptr;
 
-       n = 0;
-          q = *ptr;
+       num_digits = 0;
+       do {
+               if (((unsigned int)(*q - '0')) <= 7) {
+                       r = n * 8 + (*q - '0');
+                       if (r <= UCHAR_MAX) {
+                               n = r;
+                               ++q;
+                               if (++num_digits < 3) {
+                                       continue;
+                               }
+                       }
+               }
+               break;
+       } while (1);
 
-       for ( num_digits = 0 ; num_digits < 3 ; ++num_digits) {
-              if ((*q < '0') || (*q > '7')) { /* not a digit? */
-                      break;
-              }
-              n = n * 8 + (*q++ - '0');
-       }
+       if (num_digits == 0) {  /* mnemonic escape sequence? */
+               p = charmap;
+               do {
+                       if (*p == *q) {
+                               q++;
+                               break;
+                       }
+               } while (*++p);
+               n = *(p+(sizeof(charmap)/2));
+       }
 
-       if (num_digits == 0) {  /* mnemonic escape sequence? */
-                  for (p=charmap ; *p ; p++) {
-                          if (*p == *q) {
-                                  q++;
-                                  break;
-                          }
-                  }
-                  n = *(p+(sizeof(charmap)/2));
-          }
-
-          /* doesn't hurt to fall through to here from mnemonic case */
-          if (n > UCHAR_MAX) { /* is octal code too big for a char? */
-                  n /= 8;                      /* adjust value and */
-                  --q;                         /* back up one char */
-          }
-
-          *ptr = q;
-          return (char) n;
+       *ptr = q;
+       return (char) n;
 }
 
-
 /* END CODE */
 /*
 Local Variables: