* 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>
+#include "busybox.h"
#define BB_DECLARE_EXTERN
#define bb_need_write_error
#include "messages.c"
-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()
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);
}
/* NOTREACHED */
}
-static void map(register unsigned char *string1, register unsigned char *string2)
+static void map(register unsigned char *string1, unsigned int string1_len,
+ register unsigned char *string2, unsigned int string2_len)
{
unsigned char last = '0';
+ unsigned int i, j;
- while (*string1) {
- if (*string2 == '\0')
- vector[*string1] = last;
+ for (j = 0, i = 0; i < string1_len; i++) {
+ if (string2_len <= j)
+ pvector[string1[i]] = last;
else
- vector[*string1] = last = *string2++;
- string1++;
+ pvector[string1[i]] = last = string2[j++];
}
}
-static void expand(char *arg, register unsigned char *buffer)
+static unsigned int expand(char *arg, register unsigned char *buffer)
{
+ unsigned char *buffer_start = buffer;
int i, ac;
while (*arg) {
} else
*buffer++ = *arg++;
}
+
+ return (buffer - buffer_start);
}
-static void complement(unsigned char *buffer)
+static int complement(unsigned char *buffer, int buffer_len)
{
- register unsigned char *ptr;
- register short i, index;
- unsigned char conv[ASCII + 2];
+ register short i, j, index;
+ char conv[ASCII + 2];
index = 0;
- for (i = 1; i <= ASCII; i++) {
- for (ptr = buffer; *ptr; ptr++)
- if (*ptr == i)
+ for (i = 0; i <= ASCII; i++) {
+ for (j = 0; j < buffer_len; j++)
+ if (buffer[j] == i)
break;
- if (*ptr == '\0')
+ if (j == buffer_len)
conv[index++] = i & ASCII;
}
- conv[index] = '\0';
- strcpy((char *) buffer, (char *) conv);
+ memcpy(buffer, conv, index);
+ return index;
}
extern int tr_main(int argc, char **argv)
{
register unsigned char *ptr;
+ int output_length=0, input_length;
int index = 1;
- short i;
+ 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[index][0] == '-') {
for (ptr = (unsigned char *) &argv[index][1]; *ptr; ptr++) {
sq_fl = TRUE;
break;
default:
- usage(tr_usage);
+ show_usage();
}
}
index++;
}
if (argv[index] != NULL) {
- expand(argv[index++], input);
+ input_length = expand(argv[index++], input);
if (com_fl)
- complement(input);
+ input_length = complement(input, input_length);
if (argv[index] != NULL) {
if (*argv[index] == '\0')
- fatalError("STRING2 cannot be empty\n");
- expand(argv[index], output);
- map(input, output);
+ error_msg_and_die("STRING2 cannot be empty");
+ output_length = expand(argv[index], output);
+ map(input, input_length, output, output_length);
}
- for (ptr = input; *ptr; ptr++)
- invec[*ptr] = TRUE;
- for (ptr = output; *ptr; ptr++)
- outvec[*ptr] = TRUE;
+ for (i = 0; i < input_length; i++)
+ invec[(int)input[i]] = TRUE;
+ for (i = 0; i < output_length; i++)
+ outvec[(int)output[i]] = TRUE;
}
convert();
return (0);
projects / oweals / busybox.git / blobdiff