Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/coreutils/tr.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/coreutils/tr.c (modified) (4 diffs)

branches/3.3/mindi-busybox/coreutils/tr.c

@@ -92 +92 @@
  *   Equiv classess, e.g. [=A=] ==> A   (hmmmmmmm?)
  * not supported:
- *   \ooo-\ooo - octal ranges
  *   [x*N] - repeat char x N times
  *   [x*] - repeat char x until it fills STRING2:
@@ -100 +99 @@
  * qweddd
  */
-static unsigned expand(const char *arg, char **buffer_p)
+static unsigned expand(char *arg, char **buffer_p)
 {
     char *buffer = *buffer_p;
@@ -114 +113 @@
         }
         if (*arg == '\\') {
+            const char *z;
             arg++;
-            buffer[pos++] = bb_process_escape_sequence(&arg);
-            continue;
+            z = arg;
+            ac = bb_process_escape_sequence(&z);
+            arg = (char *)z;
+            arg--;
+            *arg = ac;
+            /*
+             * fall through, there may be a range.
+             * If not, current char will be treated anyway.
+             */
         }
         if (arg[1] == '-') { /* "0-9..." */
@@ -125 +132 @@
             }
             i = (unsigned char) *arg;
+            arg += 3; /* skip 0-9 or 0-\ */
+            if (ac == '\\') {
+                const char *z;
+                z = arg;
+                ac = bb_process_escape_sequence(&z);
+                arg = (char *)z;
+            }
             while (i <= ac) /* ok: i is unsigned _int_ */
                 buffer[pos++] = i++;
-            arg += 3; /* skip 0-9 */
             continue;
         }