- patch from Denis Vlasenko to add and use bb_xopen3()

[oweals/busybox.git] / coreutils / tr.c

diff --git a/coreutils/tr.c b/coreutils/tr.c
index 6e3f97b36d9f42c741b54f091ec1bfcb17723eb0..15a9d17b01eef57a7cdbc348a4a0234deca81af7 100644 (file)
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -38,10 +38,11 @@
 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(void)
 {
@@ -51,14 +52,14 @@ static void convert(void)
 
        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)
                                        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;
@@ -140,9 +141,9 @@ 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)
-                                       strcat(buffer, " \f\n\r\t\v");
+                                       strcat((char*)buffer, " \f\n\r\t\v");
                                else if (strncmp(arg, "blank", 5) == 0)
-                                       strcat(buffer, " \t");
+                                       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++)
@@ -155,7 +156,7 @@ static unsigned int expand(const char *arg, register unsigned char *buffer)
                                                        *buffer++ = i;
                                }
                                else {
-                                       strcat(buffer, "[:");
+                                       strcat((char*)buffer, "[:");
                                        arg++;
                                        continue;
                                }
@@ -201,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_CONFIG_BUFFER(output, BUFSIZ);
-       RESERVE_CONFIG_BUFFER(input,  BUFSIZ);
-       RESERVE_CONFIG_UBUFFER(vector, ASCII+1);
+       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++) {
@@ -244,14 +243,14 @@ 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')
                                bb_error_msg_and_die("STRING2 cannot be empty");
-                       output_length = expand(argv[idx], output);
-                       map(input, input_length, output, output_length);
+                       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[(unsigned char)input[i]] = TRUE;