X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Ftr.c;h=6eb86750d0417afb091d0fd89f96b20595908b9d;hb=519d7df930d2ac14b7a833c0255a4a5abd5a329b;hp=15e3709bb88a6f8ca230ba9eade0badd88c85728;hpb=d35c21587a4139031c077fd122252217a4713681;p=oweals%2Fbusybox.git diff --git a/coreutils/tr.c b/coreutils/tr.c index 15e3709bb..6eb86750d 100644 --- a/coreutils/tr.c +++ b/coreutils/tr.c @@ -2,109 +2,164 @@ /* * Mini tr implementation for busybox * - * Copyright (c) Michiel Huisjes + ** Copyright (c) 1987,1997, Prentice Hall All rights reserved. * - * This version of tr is adapted from Minix tr and was modified - * by Erik Andersen to be used in busybox. + * The name of Prentice Hall may not be used to endorse or promote + * products derived from this software without specific prior + * written permission. * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * Copyright (c) Michiel Huisjes * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * This version of tr is adapted from Minix tr and was modified + * by Erik Andersen to be used in busybox. * - * 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. + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include "busybox.h" -#include -#include -#include -#include -#include -#define BB_DECLARE_EXTERN -#define bb_need_write_error -#include "messages.c" - -static const int ASCII = 0377; - -/* some glabals shared across this file */ + +// Even with -funsigned-char, gcc still complains about char as an array index. + +#define GCC4_IS_STUPID int + +#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 *pvector; -static char *pinvec, *poutvec; +static char *poutput, *pvector, *pinvec, *poutvec; - -static void convert() +static void convert(void) { - short read_chars = 0; - short c, coded; - short last = -1; + int read_chars = 0, in_index = 0, out_index = 0, c, coded, last = -1; for (;;) { + // If we're out of input, flush output and read more input. + if (in_index == read_chars) { - if ((read_chars = read(0, (char *) pinput, BUFSIZ)) <= 0) { + if (out_index) { + if (write(1, (char *) poutput, out_index) != out_index) + bb_error_msg_and_die(bb_msg_write_error); + out_index = 0; + } + + if ((read_chars = read(0, bb_common_bufsiz1, 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 = bb_common_bufsiz1[in_index++]; coded = pvector[c]; if (del_fl && pinvec[c]) continue; if (sq_fl && last == coded && (pinvec[c] || poutvec[coded])) 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); - } - out_index = 0; - } } /* NOTREACHED */ } -static void map(register unsigned char *string1, unsigned int string1_len, - register unsigned char *string2, unsigned int string2_len) +static void map(char *string1, unsigned int string1_len, + char *string2, unsigned int string2_len) { - unsigned char last = '0'; + char last = '0'; unsigned int i, j; for (j = 0, i = 0; i < string1_len; i++) { if (string2_len <= j) - pvector[string1[i]] = last; + pvector[(GCC4_IS_STUPID)string1[i]] = last; else - pvector[string1[i]] = last = string2[j++]; + pvector[(GCC4_IS_STUPID)string1[i]] = last = string2[j++]; } } -static unsigned int expand(char *arg, register unsigned char *buffer) +/* 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, char *buffer) { - unsigned char *buffer_start = buffer; + char *buffer_start = buffer; int i, ac; 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 && i == ':') { + 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 = '0'; i <= '9'; i++) + *buffer++ = i; + for (i = 'A'; i <= 'Z'; i++) + *buffer++ = i; + for (i = 'a'; i <= 'z'; 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) { + const char s[] = "\t\n\v\f\r "; + strcat((char*)buffer, s); + buffer += sizeof(s) - 1; + } + else if (strncmp(arg, "blank", 5) == 0) { + *buffer++ = '\t'; + *buffer++ = ' '; + } + /* 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 { + *buffer++ = '['; + *buffer++ = ':'; + continue; + } + break; + } + if (ENABLE_FEATURE_TR_EQUIV && i == '=') { + *buffer++ = *arg; + /* skip the closing =] */ + arg += 3; + continue; + } if (*arg++ != '-') { *buffer++ = '['; arg -= 2; @@ -113,7 +168,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++; } @@ -121,44 +176,42 @@ static unsigned int expand(char *arg, register unsigned char *buffer) return (buffer - buffer_start); } -static int complement(unsigned char *buffer, int buffer_len) +static int complement(char *buffer, int buffer_len) { - register short i, j, index; + 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) +int tr_main(int argc, char **argv) { - register unsigned char *ptr; + unsigned char *ptr; int output_length=0, input_length; - int index = 1; + 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; - 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; @@ -170,68 +223,31 @@ 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++], bb_common_bufsiz1); 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); - map(input, input_length, output, output_length); + input_length = complement(bb_common_bufsiz1, input_length); + if (argv[idx] != NULL) { + if (*argv[idx] == '\0') + bb_error_msg_and_die("STRING2 cannot be empty"); + output_length = expand(argv[idx], output); + map(bb_common_bufsiz1, input_length, output, output_length); } for (i = 0; i < input_length; i++) - invec[input[i]] = TRUE; + invec[(GCC4_IS_STUPID)bb_common_bufsiz1[i]] = TRUE; for (i = 0; i < output_length; i++) - outvec[output[i]] = TRUE; + outvec[(GCC4_IS_STUPID)output[i]] = TRUE; } convert(); return (0); } - -/* - * 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 - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL PRENTICE HALL OR ANY AUTHORS OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ -