X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=coreutils%2Ftr.c;h=15a9d17b01eef57a7cdbc348a4a0234deca81af7;hb=c2cb0f32b44a9918364af39c24b5643388c553f6;hp=a5d068262bb636488e1ed6adf7ffb70a1bc3ef3f;hpb=22ecf049b634ccd507ed0587526599ed1971c308;p=oweals%2Fbusybox.git diff --git a/coreutils/tr.c b/coreutils/tr.c index a5d068262..15a9d17b0 100644 --- a/coreutils/tr.c +++ b/coreutils/tr.c @@ -4,8 +4,8 @@ * * Copyright (c) Michiel Huisjes * - * This version of tr is adapted from Minix tr and was modified - * by Erik Andersen to be used in busybox. + * This version of tr is adapted from Minix tr and was modified + * by Erik Andersen to be used in busybox. * * 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,7 +20,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * * Original copyright notice is retained at the end of this file. */ @@ -28,23 +28,23 @@ #include #include #include +#include #include #include "busybox.h" -/* 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 "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 */ -static unsigned char *poutput, *pinput; +static unsigned char *poutput; static unsigned char *pvector; -static char *pinvec, *poutvec; +static unsigned char *pinvec, *poutvec; +#define input bb_common_bufsiz1 -static void convert() +static void convert(void) { short read_chars = 0; short c, coded; @@ -52,14 +52,14 @@ static void convert() for (;;) { if (in_index == read_chars) { - if ((read_chars = read(0, (char *) pinput, BUFSIZ)) <= 0) { + if ((read_chars = read(0, input, 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; } - c = pinput[in_index++]; + c = input[in_index++]; coded = pvector[c]; if (del_fl && pinvec[c]) continue; @@ -67,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; } } @@ -95,6 +93,7 @@ static void map(register unsigned char *string1, unsigned int string1_len, /* supported constructs: * Ranges, e.g., [0-9] ==> 0123456789 * Escapes, e.g., \a ==> Control-G + * Character classes, e.g. [:upper:] ==> A ... Z */ static unsigned int expand(const char *arg, register unsigned char *buffer) { @@ -104,15 +103,77 @@ static unsigned int expand(const 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++; + if (ENABLE_FEATURE_TR_CLASSES && *arg++ == ':') { + if (strncmp(arg, "alpha", 5) == 0) { + for (i = 'A'; i <= 'Z'; i++) + *buffer++ = i; + for (i = 'a'; i <= 'z'; i++) + *buffer++ = i; + } + else if (strncmp(arg, "alnum", 5) == 0) { + for (i = 'A'; i <= 'Z'; i++) + *buffer++ = i; + for (i = 'a'; i <= 'z'; i++) + *buffer++ = i; + for (i = '0'; i <= '9'; i++) + *buffer++ = i; + } + else if (strncmp(arg, "digit", 5) == 0) + for (i = '0'; i <= '9'; i++) + *buffer++ = i; + else if (strncmp(arg, "lower", 5) == 0) + for (i = 'a'; i <= 'z'; i++) + *buffer++ = i; + else if (strncmp(arg, "upper", 5) == 0) + for (i = 'A'; i <= 'Z'; i++) + *buffer++ = i; + else if (strncmp(arg, "space", 5) == 0) + strcat((char*)buffer, " \f\n\r\t\v"); + else if (strncmp(arg, "blank", 5) == 0) + strcat((char*)buffer, " \t"); + /* gcc gives a warning if braces aren't used here */ + else if (strncmp(arg, "punct", 5) == 0) { + for (i = 0; i <= ASCII; i++) + if (isprint(i) && (!isalnum(i)) && (!isspace(i))) + *buffer++ = i; + } + else if (strncmp(arg, "cntrl", 5) == 0) { + for (i = 0; i <= ASCII; i++) + if (iscntrl(i)) + *buffer++ = i; + } + else { + strcat((char*)buffer, "[:"); + arg++; + continue; + } + break; + } + if (ENABLE_FEATURE_TR_EQUIV && *arg++ == '=') { + *buffer++ = *arg; + /* skip the closing =] */ + arg += 3; + continue; + } if (*arg++ != '-') { *buffer++ = '['; arg -= 2; continue; } + i = *arg++; ac = *arg++; while (i <= ac) *buffer++ = i++; @@ -141,24 +202,22 @@ static int complement(unsigned char *buffer, int buffer_len) return ix; } -extern int tr_main(int argc, char **argv) +int tr_main(int argc, char **argv) { register unsigned char *ptr; int output_length=0, input_length; int idx = 1; int i; - RESERVE_BB_BUFFER(output, BUFSIZ); - RESERVE_BB_BUFFER(input, BUFSIZ); - RESERVE_BB_UBUFFER(vector, ASCII+1); - RESERVE_BB_BUFFER(invec, ASCII+1); - RESERVE_BB_BUFFER(outvec, ASCII+1); + RESERVE_CONFIG_BUFFER(output, BUFSIZ); + RESERVE_CONFIG_BUFFER(vector, ASCII+1); + RESERVE_CONFIG_BUFFER(invec, ASCII+1); + RESERVE_CONFIG_BUFFER(outvec, ASCII+1); /* ... but make them available globally */ - poutput = output; - pinput = input; - pvector = vector; - pinvec = invec; - poutvec = outvec; + poutput = (unsigned char*)output; + pvector = (unsigned char*)vector; + pinvec = (unsigned char*)invec; + poutvec = (unsigned char*)outvec; if (argc > 1 && argv[idx][0] == '-') { for (ptr = (unsigned char *) &argv[idx][1]; *ptr; ptr++) { @@ -173,7 +232,7 @@ extern int tr_main(int argc, char **argv) sq_fl = TRUE; break; default: - show_usage(); + bb_show_usage(); } } idx++; @@ -184,19 +243,19 @@ extern int tr_main(int argc, char **argv) } if (argv[idx] != NULL) { - input_length = expand(argv[idx++], input); + input_length = expand(argv[idx++], (unsigned char*)input); if (com_fl) - input_length = complement(input, input_length); + input_length = complement((unsigned char*)input, input_length); if (argv[idx] != NULL) { if (*argv[idx] == '\0') - error_msg_and_die("STRING2 cannot be empty"); - output_length = expand(argv[idx], output); - map(input, input_length, output, output_length); + bb_error_msg_and_die("STRING2 cannot be empty"); + output_length = expand(argv[idx], (unsigned char*)output); + map((unsigned char*)input, input_length, (unsigned char*)output, output_length); } for (i = 0; i < input_length; i++) - invec[(int)input[i]] = TRUE; + invec[(unsigned char)input[i]] = TRUE; for (i = 0; i < output_length; i++) - outvec[(int)output[i]] = TRUE; + outvec[(unsigned char)output[i]] = TRUE; } convert(); return (0); @@ -205,24 +264,24 @@ extern int tr_main(int argc, char **argv) /* * Copyright (c) 1987,1997, Prentice Hall * All rights reserved. - * + * * Redistribution and use of the MINIX operating system in source and * binary forms, with or without modification, are permitted provided * that the following conditions are met: - * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * Redistributions in binary form must reproduce the above * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials provided * with the distribution. - * + * * Neither the name of Prentice Hall nor the names of the software * authors or contributors may be used to endorse or promote * products derived from this software without specific prior * written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS, AUTHORS, AND * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF