X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Ftr.c;h=cea3b05b6bc84049a1934e7733f61ce9b104d8be;hb=ec1a4b5a521b5adf295bc757c25231910f8c854b;hp=752b13bf863affe1a90ae1be8a4bed5d4eb089b5;hpb=998dbee6d9494c4dee29a2abe195d79d9b1c2e08;p=oweals%2Fbusybox.git diff --git a/coreutils/tr.c b/coreutils/tr.c index 752b13bf8..cea3b05b6 100644 --- a/coreutils/tr.c +++ b/coreutils/tr.c @@ -2,91 +2,77 @@ /* * 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 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * 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. - * - * 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 -#include -#include -#include -#include -#include #include "busybox.h" +// 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; -static unsigned char *pvector; -static unsigned char *pinvec, *poutvec; - -#define input bb_common_bufsiz1 +static char *poutput, *pvector, *pinvec, *poutvec; 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, input, 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) bb_error_msg(bb_msg_write_error); exit(0); } in_index = 0; } - c = input[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) - bb_error_msg_and_die(bb_msg_write_error); - 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++]; } } @@ -95,9 +81,9 @@ static void map(register unsigned char *string1, unsigned int string1_len, * Escapes, e.g., \a ==> Control-G * Character classes, e.g. [:upper:] ==> A ... Z */ -static unsigned int expand(const char *arg, register unsigned char *buffer) +static unsigned int expand(const char *arg, char *buffer) { - unsigned char *buffer_start = buffer; + char *buffer_start = buffer; int i, ac; while (*arg) { @@ -142,7 +128,7 @@ static unsigned int expand(const char *arg, register unsigned char *buffer) for (i = 'A'; i <= 'Z'; i++) *buffer++ = i; else if (strncmp(arg, "space", 5) == 0) { - const char s[] = "\t\n\v\f\r "; + const char s[] = "\t\n\v\f\r "; strcat((char*)buffer, s); buffer += sizeof(s) - 1; } @@ -190,9 +176,9 @@ static unsigned int expand(const 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, ix; + short i, j, ix; char conv[ASCII + 2]; ix = 0; @@ -207,9 +193,10 @@ static int complement(unsigned char *buffer, int buffer_len) return ix; } +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 idx = 1; int i; @@ -219,10 +206,10 @@ int tr_main(int argc, char **argv) RESERVE_CONFIG_BUFFER(outvec, ASCII+1); /* ... but make them available globally */ - poutput = (unsigned char*)output; - pvector = (unsigned char*)vector; - pinvec = (unsigned char*)invec; - poutvec = (unsigned char*)outvec; + poutput = output; + pvector = vector; + pinvec = invec; + poutvec = outvec; if (argc > 1 && argv[idx][0] == '-') { for (ptr = (unsigned char *) &argv[idx][1]; *ptr; ptr++) { @@ -248,57 +235,20 @@ int tr_main(int argc, char **argv) } if (argv[idx] != NULL) { - input_length = expand(argv[idx++], (unsigned char*)input); + input_length = expand(argv[idx++], bb_common_bufsiz1); if (com_fl) - input_length = complement((unsigned char*)input, input_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], (unsigned char*)output); - map((unsigned char*)input, input_length, (unsigned char*)output, output_length); + output_length = expand(argv[idx], output); + map(bb_common_bufsiz1, input_length, output, output_length); } for (i = 0; i < input_length; i++) - invec[(unsigned char)input[i]] = TRUE; + invec[(GCC4_IS_STUPID)bb_common_bufsiz1[i]] = TRUE; for (i = 0; i < output_length; i++) - outvec[(unsigned char)output[i]] = TRUE; + outvec[(GCC4_IS_STUPID)output[i]] = TRUE; } convert(); - return (0); + 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. - * - */ -