Another update from Larry:
[oweals/busybox.git] / tr.c
diff --git a/tr.c b/tr.c
index 89fe3f5b029d9f19cc163fdaf2b371d3dfb2f568..ff0f331ffbb565260d96f1a2da7d8aaa37925436 100644 (file)
--- a/tr.c
+++ b/tr.c
  * Original copyright notice is retained at the end of this file.
  */
 
-#include "internal.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
-#define BB_DECLARE_EXTERN
-#define bb_need_write_error
-#include "messages.c"
+#include "busybox.h"
 
-const char *tr_usage="tr [-cds] STRING1 [STRING2]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nTranslate, squeeze, and/or delete characters from\n"
-       "standard input, writing to standard output.\n\n"
-       "Options:\n"
-       "\t-c\ttake complement of STRING1\n"
-       "\t-d\tdelete input characters coded STRING1\n"
-       "\t-s\tsqueeze multiple output characters of STRING2 into one character\n"
-#endif
-;
-
-
-
-#ifdef TRUE
-#undef TRUE
-#undef FALSE
-#define TRUE   1
-#define FALSE  0
-#endif
-
-#define ASCII          0377
+static const int ASCII = 0377;
 
 /* some glabals shared across this file */
 static char com_fl, del_fl, sq_fl;
-static unsigned char output[BUFSIZ], input[BUFSIZ];
-static unsigned char vector[ASCII + 1];
-static char invec[ASCII + 1], outvec[ASCII + 1];
 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 void convert()
@@ -72,22 +50,22 @@ static void convert()
 
        for (;;) {
                if (in_index == read_chars) {
-                       if ((read_chars = read(0, (char *) input, BUFSIZ)) <= 0) {
-                               if (write(1, (char *) output, out_index) != out_index)
+                       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));
                                exit(0);
                        }
                        in_index = 0;
                }
-               c = input[in_index++];
-               coded = vector[c];
-               if (del_fl && invec[c])
+               c = pinput[in_index++];
+               coded = pvector[c];
+               if (del_fl && pinvec[c])
                        continue;
-               if (sq_fl && last == coded && outvec[coded])
+               if (sq_fl && last == coded && (pinvec[c] || poutvec[coded]))
                        continue;
-               output[out_index++] = last = coded;
+               poutput[out_index++] = last = coded;
                if (out_index == BUFSIZ) {
-                       if (write(1, (char *) output, out_index) != out_index) {
+                       if (write(1, (char *) poutput, out_index) != out_index) {
                                write(2, write_error, strlen(write_error));
                                exit(1);
                        }
@@ -106,13 +84,13 @@ static void map(register unsigned char *string1, unsigned int string1_len,
 
        for (j = 0, i = 0; i < string1_len; i++) {
                if (string2_len <= j)
-                       vector[string1[i]] = last;
+                       pvector[string1[i]] = last;
                else
-                       vector[string1[i]] = last = string2[j++];
+                       pvector[string1[i]] = last = string2[j++];
        }
 }
 
-static unsigned int expand(char *arg, register unsigned char *buffer)
+static unsigned int expand(const char *arg, register unsigned char *buffer)
 {
        unsigned char *buffer_start = buffer;
        int i, ac;
@@ -140,32 +118,44 @@ static unsigned int expand(char *arg, register unsigned char *buffer)
        return (buffer - buffer_start);
 }
 
-static int complement(unsigned char *buffer, unsigned int buffer_len)
+static int complement(unsigned char *buffer, int buffer_len)
 {
-       register short i, j, index;
-       unsigned char conv[ASCII + 2];
+       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;
-       unsigned int output_length=0, input_length;
-       int index = 1;
-       short i;
-
-       if (argc > 1 && argv[index][0] == '-') {
-               for (ptr = (unsigned char *) &argv[index][1]; *ptr; 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);
+
+       /* ... but make them available globally */
+       poutput = output;
+       pinput  = input;
+       pvector = vector;
+       pinvec  = invec;
+       poutvec = outvec;
+
+       if (argc > 1 && argv[idx][0] == '-') {
+               for (ptr = (unsigned char *) &argv[idx][1]; *ptr; ptr++) {
                        switch (*ptr) {
                        case 'c':
                                com_fl = TRUE;
@@ -177,30 +167,30 @@ extern int tr_main(int argc, char **argv)
                                sq_fl = TRUE;
                                break;
                        default:
-                               usage(tr_usage);
+                               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')
-                               fatalError("STRING2 cannot be empty\n");
-                       output_length = expand(argv[index], output);
+               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);
                }
                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);