22542eca18
function old new delta vgetopt32 1318 1392 +74 runsvdir_main 703 713 +10 bb_make_directory 423 425 +2 collect_cpu 546 545 -1 opt_chars 3 - -3 opt_complementary 4 - -4 tftpd_main 567 562 -5 ntp_init 476 471 -5 zcip_main 1266 1256 -10 xxd_main 428 418 -10 whois_main 140 130 -10 who_main 463 453 -10 which_main 212 202 -10 wget_main 2535 2525 -10 watchdog_main 291 281 -10 watch_main 222 212 -10 vlock_main 399 389 -10 uuencode_main 332 322 -10 uudecode_main 316 306 -10 unlink_main 45 35 -10 udhcpd_main 1482 1472 -10 udhcpc_main 2762 2752 -10 tune2fs_main 290 280 -10 tunctl_main 366 356 -10 truncate_main 218 208 -10 tr_main 518 508 -10 time_main 1134 1124 -10 tftp_main 286 276 -10 telnetd_main 1873 1863 -10 tcpudpsvd_main 1785 1775 -10 taskset_main 521 511 -10 tar_main 1009 999 -10 tail_main 1644 1634 -10 syslogd_main 1967 1957 -10 switch_root_main 368 358 -10 svlogd_main 1454 1444 -10 sv 1296 1286 -10 stat_main 104 94 -10 start_stop_daemon_main 1028 1018 -10 split_main 542 532 -10 sort_main 796 786 -10 slattach_main 624 614 -10 shuf_main 504 494 -10 setsid_main 96 86 -10 setserial_main 1132 1122 -10 setfont_main 388 378 -10 setconsole_main 78 68 -10 sendmail_main 1209 1199 -10 sed_main 677 667 -10 script_main 1077 1067 -10 run_parts_main 325 315 -10 rtcwake_main 454 444 -10 rm_main 175 165 -10 reformime_main 119 109 -10 readlink_main 123 113 -10 rdate_main 246 236 -10 pwdx_main 189 179 -10 pstree_main 317 307 -10 pscan_main 663 653 -10 popmaildir_main 818 808 -10 pmap_main 80 70 -10 nc_main 1042 1032 -10 mv_main 558 548 -10 mountpoint_main 477 467 -10 mount_main 1264 1254 -10 modprobe_main 768 758 -10 modinfo_main 333 323 -10 mktemp_main 200 190 -10 mkswap_main 324 314 -10 mkfs_vfat_main 1489 1479 -10 microcom_main 715 705 -10 md5_sha1_sum_main 521 511 -10 man_main 867 857 -10 makedevs_main 1052 1042 -10 ls_main 563 553 -10 losetup_main 432 422 -10 loadfont_main 89 79 -10 ln_main 524 514 -10 link_main 75 65 -10 ipcalc_main 544 534 -10 iostat_main 2397 2387 -10 install_main 768 758 -10 id_main 480 470 -10 i2cset_main 1239 1229 -10 i2cget_main 380 370 -10 i2cdump_main 1482 1472 -10 i2cdetect_main 682 672 -10 hwclock_main 406 396 -10 httpd_main 741 731 -10 grep_main 837 827 -10 getty_main 1559 1549 -10 fuser_main 297 287 -10 ftpgetput_main 345 335 -10 ftpd_main 2232 2222 -10 fstrim_main 251 241 -10 fsfreeze_main 77 67 -10 fsck_minix_main 2921 2911 -10 flock_main 314 304 -10 flashcp_main 740 730 -10 flash_eraseall_main 833 823 -10 fdformat_main 532 522 -10 expand_main 680 670 -10 eject_main 335 325 -10 dumpleases_main 630 620 -10 du_main 314 304 -10 dos2unix_main 441 431 -10 diff_main 1350 1340 -10 df_main 1064 1054 -10 date_main 1095 1085 -10 cut_main 961 951 -10 cryptpw_main 228 218 -10 crontab_main 575 565 -10 crond_main 1149 1139 -10 cp_main 370 360 -10 common_traceroute_main 3834 3824 -10 common_ping_main 1767 1757 -10 comm_main 239 229 -10 cmp_main 655 645 -10 chrt_main 379 369 -10 chpst_main 704 694 -10 chpasswd_main 308 298 -10 chown_main 171 161 -10 chmod_main 158 148 -10 cat_main 428 418 -10 bzip2_main 120 110 -10 blkdiscard_main 264 254 -10 base64_main 221 211 -10 arping_main 1665 1655 -10 ar_main 556 546 -10 adjtimex_main 406 396 -10 adduser_main 882 872 -10 addgroup_main 411 401 -10 acpid_main 1198 1188 -10 optstring 11 - -11 opt_string 18 - -18 OPT_STR 25 - -25 ubi_tools_main 1288 1258 -30 ls_options 31 - -31 ------------------------------------------------------------------------------ (add/remove: 0/6 grow/shrink: 3/129 up/down: 86/-1383) Total: -1297 bytes text data bss dec hex filename 915428 485 6876 922789 e14a5 busybox_old 914629 485 6872 921986 e1182 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
361 lines
9.5 KiB
C
361 lines
9.5 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Mini tr implementation for busybox
|
|
*
|
|
** Copyright (c) 1987,1997, Prentice Hall All rights reserved.
|
|
*
|
|
* The name of Prentice Hall may not be used to endorse or promote
|
|
* products derived from this software without specific prior
|
|
* written permission.
|
|
*
|
|
* Copyright (c) Michiel Huisjes
|
|
*
|
|
* This version of tr is adapted from Minix tr and was modified
|
|
* by Erik Andersen <andersen@codepoet.org> to be used in busybox.
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
*/
|
|
/* http://www.opengroup.org/onlinepubs/009695399/utilities/tr.html
|
|
* TODO: graph, print
|
|
*/
|
|
//config:config TR
|
|
//config: bool "tr (5.5 kb)"
|
|
//config: default y
|
|
//config: help
|
|
//config: tr is used to squeeze, and/or delete characters from standard
|
|
//config: input, writing to standard output.
|
|
//config:
|
|
//config:config FEATURE_TR_CLASSES
|
|
//config: bool "Enable character classes (such as [:upper:])"
|
|
//config: default y
|
|
//config: depends on TR
|
|
//config: help
|
|
//config: Enable character classes, enabling commands such as:
|
|
//config: tr [:upper:] [:lower:] to convert input into lowercase.
|
|
//config:
|
|
//config:config FEATURE_TR_EQUIV
|
|
//config: bool "Enable equivalence classes"
|
|
//config: default y
|
|
//config: depends on TR
|
|
//config: help
|
|
//config: Enable equivalence classes, which essentially add the enclosed
|
|
//config: character to the current set. For instance, tr [=a=] xyz would
|
|
//config: replace all instances of 'a' with 'xyz'. This option is mainly
|
|
//config: useful for cases when no other way of expressing a character
|
|
//config: is possible.
|
|
|
|
//applet:IF_TR(APPLET(tr, BB_DIR_USR_BIN, BB_SUID_DROP))
|
|
|
|
//kbuild:lib-$(CONFIG_TR) += tr.o
|
|
|
|
//usage:#define tr_trivial_usage
|
|
//usage: "[-cds] STRING1 [STRING2]"
|
|
//usage:#define tr_full_usage "\n\n"
|
|
//usage: "Translate, squeeze, or delete characters from stdin, writing to stdout\n"
|
|
//usage: "\n -c Take complement of STRING1"
|
|
//usage: "\n -d Delete input characters coded STRING1"
|
|
//usage: "\n -s Squeeze multiple output characters of STRING2 into one character"
|
|
//usage:
|
|
//usage:#define tr_example_usage
|
|
//usage: "$ echo \"gdkkn vnqkc\" | tr [a-y] [b-z]\n"
|
|
//usage: "hello world\n"
|
|
|
|
#include "libbb.h"
|
|
|
|
enum {
|
|
ASCII = 256,
|
|
/* string buffer needs to be at least as big as the whole "alphabet".
|
|
* BUFSIZ == ASCII is ok, but we will realloc in expand
|
|
* even for smallest patterns, let's avoid that by using *2:
|
|
*/
|
|
TR_BUFSIZ = (BUFSIZ > ASCII*2) ? BUFSIZ : ASCII*2,
|
|
};
|
|
|
|
static void map(char *pvector,
|
|
char *string1, unsigned string1_len,
|
|
char *string2, unsigned string2_len)
|
|
{
|
|
char last = '0';
|
|
unsigned i, j;
|
|
|
|
for (j = 0, i = 0; i < string1_len; i++) {
|
|
if (string2_len <= j)
|
|
pvector[(unsigned char)(string1[i])] = last;
|
|
else
|
|
pvector[(unsigned char)(string1[i])] = last = string2[j++];
|
|
}
|
|
}
|
|
|
|
/* supported constructs:
|
|
* Ranges, e.g., 0-9 ==> 0123456789
|
|
* Escapes, e.g., \a ==> Control-G
|
|
* Character classes, e.g. [:upper:] ==> A...Z
|
|
* Equiv classess, e.g. [=A=] ==> A (hmmmmmmm?)
|
|
* not supported:
|
|
* [x*N] - repeat char x N times
|
|
* [x*] - repeat char x until it fills STRING2:
|
|
* # echo qwe123 | /usr/bin/tr 123456789 '[d]'
|
|
* qwe[d]
|
|
* # echo qwe123 | /usr/bin/tr 123456789 '[d*]'
|
|
* qweddd
|
|
*/
|
|
static unsigned expand(char *arg, char **buffer_p)
|
|
{
|
|
char *buffer = *buffer_p;
|
|
unsigned pos = 0;
|
|
unsigned size = TR_BUFSIZ;
|
|
unsigned i; /* can't be unsigned char: must be able to hold 256 */
|
|
unsigned char ac;
|
|
|
|
while (*arg) {
|
|
if (pos + ASCII > size) {
|
|
size += ASCII;
|
|
*buffer_p = buffer = xrealloc(buffer, size);
|
|
}
|
|
if (*arg == '\\') {
|
|
const char *z;
|
|
arg++;
|
|
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..." */
|
|
ac = arg[2];
|
|
if (ac == '\0') { /* "0-": copy verbatim */
|
|
buffer[pos++] = *arg++; /* copy '0' */
|
|
continue; /* next iter will copy '-' and stop */
|
|
}
|
|
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++;
|
|
continue;
|
|
}
|
|
if ((ENABLE_FEATURE_TR_CLASSES || ENABLE_FEATURE_TR_EQUIV)
|
|
&& *arg == '['
|
|
) {
|
|
arg++;
|
|
i = (unsigned char) *arg++;
|
|
/* "[xyz...". i=x, arg points to y */
|
|
if (ENABLE_FEATURE_TR_CLASSES && i == ':') { /* [:class:] */
|
|
#define CLO ":]\0"
|
|
static const char classes[] ALIGN1 =
|
|
"alpha"CLO "alnum"CLO "digit"CLO
|
|
"lower"CLO "upper"CLO "space"CLO
|
|
"blank"CLO "punct"CLO "cntrl"CLO
|
|
"xdigit"CLO;
|
|
enum {
|
|
CLASS_invalid = 0, /* we increment the retval */
|
|
CLASS_alpha = 1,
|
|
CLASS_alnum = 2,
|
|
CLASS_digit = 3,
|
|
CLASS_lower = 4,
|
|
CLASS_upper = 5,
|
|
CLASS_space = 6,
|
|
CLASS_blank = 7,
|
|
CLASS_punct = 8,
|
|
CLASS_cntrl = 9,
|
|
CLASS_xdigit = 10,
|
|
//CLASS_graph = 11,
|
|
//CLASS_print = 12,
|
|
};
|
|
smalluint j;
|
|
char *tmp;
|
|
|
|
/* xdigit needs 8, not 7 */
|
|
i = 7 + (arg[0] == 'x');
|
|
tmp = xstrndup(arg, i);
|
|
j = index_in_strings(classes, tmp) + 1;
|
|
free(tmp);
|
|
|
|
if (j == CLASS_invalid)
|
|
goto skip_bracket;
|
|
|
|
arg += i;
|
|
if (j == CLASS_alnum || j == CLASS_digit || j == CLASS_xdigit) {
|
|
for (i = '0'; i <= '9'; i++)
|
|
buffer[pos++] = i;
|
|
}
|
|
if (j == CLASS_alpha || j == CLASS_alnum || j == CLASS_upper) {
|
|
for (i = 'A'; i <= 'Z'; i++)
|
|
buffer[pos++] = i;
|
|
}
|
|
if (j == CLASS_alpha || j == CLASS_alnum || j == CLASS_lower) {
|
|
for (i = 'a'; i <= 'z'; i++)
|
|
buffer[pos++] = i;
|
|
}
|
|
if (j == CLASS_space || j == CLASS_blank) {
|
|
buffer[pos++] = '\t';
|
|
if (j == CLASS_space) {
|
|
buffer[pos++] = '\n';
|
|
buffer[pos++] = '\v';
|
|
buffer[pos++] = '\f';
|
|
buffer[pos++] = '\r';
|
|
}
|
|
buffer[pos++] = ' ';
|
|
}
|
|
if (j == CLASS_punct || j == CLASS_cntrl) {
|
|
for (i = '\0'; i < ASCII; i++) {
|
|
if ((j == CLASS_punct && isprint_asciionly(i) && !isalnum(i) && !isspace(i))
|
|
|| (j == CLASS_cntrl && iscntrl(i))
|
|
) {
|
|
buffer[pos++] = i;
|
|
}
|
|
}
|
|
}
|
|
if (j == CLASS_xdigit) {
|
|
for (i = 'A'; i <= 'F'; i++) {
|
|
buffer[pos + 6] = i | 0x20;
|
|
buffer[pos++] = i;
|
|
}
|
|
pos += 6;
|
|
}
|
|
continue;
|
|
}
|
|
/* "[xyz...", i=x, arg points to y */
|
|
if (ENABLE_FEATURE_TR_EQUIV && i == '=') { /* [=CHAR=] */
|
|
buffer[pos++] = *arg; /* copy CHAR */
|
|
if (!arg[0] || arg[1] != '=' || arg[2] != ']')
|
|
bb_show_usage();
|
|
arg += 3; /* skip CHAR=] */
|
|
continue;
|
|
}
|
|
/* The rest of "[xyz..." cases is treated as normal
|
|
* string, "[" has no special meaning here:
|
|
* tr "[a-z]" "[A-Z]" can be written as tr "a-z" "A-Z",
|
|
* also try tr "[a-z]" "_A-Z+" and you'll see that
|
|
* [] is not special here.
|
|
*/
|
|
skip_bracket:
|
|
arg -= 2; /* points to "[" in "[xyz..." */
|
|
}
|
|
buffer[pos++] = *arg++;
|
|
}
|
|
return pos;
|
|
}
|
|
|
|
/* NB: buffer is guaranteed to be at least TR_BUFSIZE
|
|
* (which is >= ASCII) big.
|
|
*/
|
|
static int complement(char *buffer, int buffer_len)
|
|
{
|
|
int len;
|
|
char conv[ASCII];
|
|
unsigned char ch;
|
|
|
|
len = 0;
|
|
ch = '\0';
|
|
while (1) {
|
|
if (memchr(buffer, ch, buffer_len) == NULL)
|
|
conv[len++] = ch;
|
|
if (++ch == '\0')
|
|
break;
|
|
}
|
|
memcpy(buffer, conv, len);
|
|
return len;
|
|
}
|
|
|
|
int tr_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int tr_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
int i;
|
|
smalluint opts;
|
|
ssize_t read_chars;
|
|
size_t in_index, out_index;
|
|
unsigned last = UCHAR_MAX + 1; /* not equal to any char */
|
|
unsigned char coded, c;
|
|
char *str1 = xmalloc(TR_BUFSIZ);
|
|
char *str2 = xmalloc(TR_BUFSIZ);
|
|
int str2_length;
|
|
int str1_length;
|
|
char *vector = xzalloc(ASCII * 3);
|
|
char *invec = vector + ASCII;
|
|
char *outvec = vector + ASCII * 2;
|
|
|
|
#define TR_OPT_complement (3 << 0)
|
|
#define TR_OPT_delete (1 << 2)
|
|
#define TR_OPT_squeeze_reps (1 << 3)
|
|
|
|
for (i = 0; i < ASCII; i++) {
|
|
vector[i] = i;
|
|
/*invec[i] = outvec[i] = FALSE; - done by xzalloc */
|
|
}
|
|
|
|
/* -C/-c difference is that -C complements "characters",
|
|
* and -c complements "values" (binary bytes I guess).
|
|
* In POSIX locale, these are the same.
|
|
*/
|
|
|
|
/* '+': stop at first non-option */
|
|
opts = getopt32(argv, "^+" "Ccds" "\0" "-1");
|
|
argv += optind;
|
|
|
|
str1_length = expand(*argv++, &str1);
|
|
str2_length = 0;
|
|
if (opts & TR_OPT_complement)
|
|
str1_length = complement(str1, str1_length);
|
|
if (*argv) {
|
|
if (argv[0][0] == '\0')
|
|
bb_error_msg_and_die("STRING2 cannot be empty");
|
|
str2_length = expand(*argv, &str2);
|
|
map(vector, str1, str1_length,
|
|
str2, str2_length);
|
|
}
|
|
for (i = 0; i < str1_length; i++)
|
|
invec[(unsigned char)(str1[i])] = TRUE;
|
|
for (i = 0; i < str2_length; i++)
|
|
outvec[(unsigned char)(str2[i])] = TRUE;
|
|
|
|
goto start_from;
|
|
|
|
/* In this loop, str1 space is reused as input buffer,
|
|
* str2 - as output one. */
|
|
for (;;) {
|
|
/* If we're out of input, flush output and read more input. */
|
|
if ((ssize_t)in_index == read_chars) {
|
|
if (out_index) {
|
|
xwrite(STDOUT_FILENO, str2, out_index);
|
|
start_from:
|
|
out_index = 0;
|
|
}
|
|
read_chars = safe_read(STDIN_FILENO, str1, TR_BUFSIZ);
|
|
if (read_chars <= 0) {
|
|
if (read_chars < 0)
|
|
bb_perror_msg_and_die(bb_msg_read_error);
|
|
break;
|
|
}
|
|
in_index = 0;
|
|
}
|
|
c = str1[in_index++];
|
|
if ((opts & TR_OPT_delete) && invec[c])
|
|
continue;
|
|
coded = vector[c];
|
|
if ((opts & TR_OPT_squeeze_reps) && last == coded
|
|
&& (invec[c] || outvec[coded])
|
|
) {
|
|
continue;
|
|
}
|
|
str2[out_index++] = last = coded;
|
|
}
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP) {
|
|
free(vector);
|
|
free(str2);
|
|
free(str1);
|
|
}
|
|
|
|
return EXIT_SUCCESS;
|
|
}
|