emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tr: support octal ranges

Browse Source 
now, we can do printf "a\tb\tcdef\n" | ./busybox tr -d "\1-\14b-e"
af

and bonus, we save some bytes.

function                                             old     new   delta
expand                                               718     699     -19
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-19)             Total: -19
bytes

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Richard Genoud
2015-10-26 10:10:28 +01:00
committed by Denys Vlasenko
parent 028524317d
commit d683c5c2f1
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
coreutils/tr.c
View File

@@ -91,7 +91,6 @@ static void map(char *pvector,
* Character classes, e.g. [:upper:] ==> A...Z * Character classes, e.g. [:upper:] ==> A...Z
* Equiv classess, e.g. [=A=] ==> A (hmmmmmmm?) * Equiv classess, e.g. [=A=] ==> A (hmmmmmmm?)
* not supported: * not supported:
* \ooo-\ooo - octal ranges
* [x*N] - repeat char x N times * [x*N] - repeat char x N times
* [x*] - repeat char x until it fills STRING2: * [x*] - repeat char x until it fills STRING2:
* # echo qwe123 | /usr/bin/tr 123456789 '[d]' * # echo qwe123 | /usr/bin/tr 123456789 '[d]'
@@ -99,7 +98,7 @@ static void map(char *pvector,
* # echo qwe123 | /usr/bin/tr 123456789 '[d*]' * # echo qwe123 | /usr/bin/tr 123456789 '[d*]'
* qweddd * qweddd
*/ */
static unsigned expand(const char *arg, char **buffer_p) static unsigned expand(char *arg, char **buffer_p)
{ {
char *buffer = *buffer_p; char *buffer = *buffer_p;
unsigned pos = 0; unsigned pos = 0;
@@ -113,9 +112,17 @@ static unsigned expand(const char *arg, char **buffer_p)
*buffer_p = buffer = xrealloc(buffer, size); *buffer_p = buffer = xrealloc(buffer, size);
} }
if (*arg == '\\') { if (*arg == '\\') {
const char *z;
arg++; arg++;
buffer[pos++] = bb_process_escape_sequence(&arg); z = arg;
continue; 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..." */ if (arg[1] == '-') { /* "0-9..." */
ac = arg[2]; ac = arg[2];
@@ -124,9 +131,15 @@ static unsigned expand(const char *arg, char **buffer_p)
continue; /* next iter will copy '-' and stop */ continue; /* next iter will copy '-' and stop */
} }
i = (unsigned char) *arg; 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_ */ while (i <= ac) /* ok: i is unsigned _int_ */
buffer[pos++] = i++; buffer[pos++] = i++;
arg += 3; /* skip 0-9 */
continue; continue;
} }
if ((ENABLE_FEATURE_TR_CLASSES || ENABLE_FEATURE_TR_EQUIV) if ((ENABLE_FEATURE_TR_CLASSES || ENABLE_FEATURE_TR_EQUIV)