X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Ftr.c;h=a00e3613427318e10eabffa07c867c250cad5610;hb=138d71bc35b86964a4c2bd97f7f578edfead1925;hp=d21e672fe0a864c7b294fdb861cadcc87ba02ac4;hpb=59ab025363d884deb2013dcaae6c968585a6ec72;p=oweals%2Fbusybox.git diff --git a/coreutils/tr.c b/coreutils/tr.c index d21e672fe..a00e36134 100644 --- a/coreutils/tr.c +++ b/coreutils/tr.c @@ -24,19 +24,18 @@ * Original copyright notice is retained at the end of this file. */ -#include "busybox.h" #include #include #include #include #include -#define BB_DECLARE_EXTERN -#define bb_need_write_error -#include "messages.c" +#include "busybox.h" -static const int ASCII = 0377; +/* This must be a #define, since when DODEBUG and BUFFERS_GO_IN_BSS are + * enabled, we otherwise get a "storage size isn't constant error. */ +#define ASCII 0377 -/* some glabals shared across this file */ +/* some "globals" shared across this file */ static char com_fl, del_fl, sq_fl; static short in_index, out_index; /* these last are pointers to static buffers declared in tr_main */ @@ -45,7 +44,7 @@ static unsigned char *pvector; static char *pinvec, *poutvec; -static void convert() +static void convert(void) { short read_chars = 0; short c, coded; @@ -55,7 +54,7 @@ static void convert() if (in_index == read_chars) { if ((read_chars = read(0, (char *) pinput, BUFSIZ)) <= 0) { if (write(1, (char *) poutput, out_index) != out_index) - write(2, write_error, strlen(write_error)); + bb_error_msg(bb_msg_write_error); exit(0); } in_index = 0; @@ -68,10 +67,8 @@ static void convert() continue; poutput[out_index++] = last = coded; if (out_index == BUFSIZ) { - if (write(1, (char *) poutput, out_index) != out_index) { - write(2, write_error, strlen(write_error)); - exit(1); - } + if (write(1, (char *) poutput, out_index) != out_index) + bb_error_msg_and_die(bb_msg_write_error); out_index = 0; } } @@ -93,7 +90,11 @@ static void map(register unsigned char *string1, unsigned int string1_len, } } -static unsigned int expand(char *arg, register unsigned char *buffer) +/* supported constructs: + * Ranges, e.g., [0-9] ==> 0123456789 + * Escapes, e.g., \a ==> Control-G + */ +static unsigned int expand(const char *arg, register unsigned char *buffer) { unsigned char *buffer_start = buffer; int i, ac; @@ -101,7 +102,17 @@ static unsigned int expand(char *arg, register unsigned char *buffer) while (*arg) { if (*arg == '\\') { arg++; - *buffer++ = process_escape_sequence(&arg); + *buffer++ = bb_process_escape_sequence(&arg); + } else if (*(arg+1) == '-') { + ac = *(arg+2); + if(ac == 0) { + *buffer++ = *arg++; + continue; + } + i = *arg; + while (i <= ac) + *buffer++ = i++; + arg += 3; /* Skip the assumed a-z */ } else if (*arg == '[') { arg++; i = *arg++; @@ -113,7 +124,7 @@ static unsigned int expand(char *arg, register unsigned char *buffer) ac = *arg++; while (i <= ac) *buffer++ = i++; - arg++; /* Skip ']' */ + arg++; /* Skip the assumed ']' */ } else *buffer++ = *arg++; } @@ -123,31 +134,32 @@ static unsigned int expand(char *arg, register unsigned char *buffer) static int complement(unsigned char *buffer, int buffer_len) { - register short i, j, index; + register short i, j, ix; char conv[ASCII + 2]; - index = 0; + ix = 0; for (i = 0; i <= ASCII; i++) { for (j = 0; j < buffer_len; j++) if (buffer[j] == i) break; if (j == buffer_len) - conv[index++] = i & ASCII; + conv[ix++] = i & ASCII; } - memcpy(buffer, conv, index); - return index; + memcpy(buffer, conv, ix); + return ix; } extern int tr_main(int argc, char **argv) { register unsigned char *ptr; int output_length=0, input_length; - int index = 1; + int idx = 1; int i; - /* set up big arrays here (better than making a bunch of static arrays up top) */ - unsigned char output[BUFSIZ], input[BUFSIZ]; - unsigned char vector[ASCII + 1]; - char invec[ASCII + 1], outvec[ASCII + 1]; + RESERVE_CONFIG_BUFFER(output, BUFSIZ); + RESERVE_CONFIG_BUFFER(input, BUFSIZ); + RESERVE_CONFIG_UBUFFER(vector, ASCII+1); + RESERVE_CONFIG_BUFFER(invec, ASCII+1); + RESERVE_CONFIG_BUFFER(outvec, ASCII+1); /* ... but make them available globally */ poutput = output; @@ -156,8 +168,8 @@ extern int tr_main(int argc, char **argv) pinvec = invec; poutvec = outvec; - if (argc > 1 && argv[index][0] == '-') { - for (ptr = (unsigned char *) &argv[index][1]; *ptr; ptr++) { + if (argc > 1 && argv[idx][0] == '-') { + for (ptr = (unsigned char *) &argv[idx][1]; *ptr; ptr++) { switch (*ptr) { case 'c': com_fl = TRUE; @@ -169,30 +181,30 @@ extern int tr_main(int argc, char **argv) sq_fl = TRUE; break; default: - usage(tr_usage); + bb_show_usage(); } } - index++; + idx++; } for (i = 0; i <= ASCII; i++) { vector[i] = i; invec[i] = outvec[i] = FALSE; } - if (argv[index] != NULL) { - input_length = expand(argv[index++], input); + if (argv[idx] != NULL) { + input_length = expand(argv[idx++], input); if (com_fl) input_length = complement(input, input_length); - if (argv[index] != NULL) { - if (*argv[index] == '\0') - error_msg_and_die("STRING2 cannot be empty\n"); - output_length = expand(argv[index], output); + if (argv[idx] != NULL) { + if (*argv[idx] == '\0') + bb_error_msg_and_die("STRING2 cannot be empty"); + output_length = expand(argv[idx], output); map(input, input_length, output, output_length); } for (i = 0; i < input_length; i++) - invec[input[i]] = TRUE; + invec[(int)input[i]] = TRUE; for (i = 0; i < output_length; i++) - outvec[output[i]] = TRUE; + outvec[(int)output[i]] = TRUE; } convert(); return (0);