emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch from Matt Kraai <kraai@alumni.carnegiemellon.edu>:

Browse Source 
GNU tr complains on the following:

$ tr a ''
tr: when not truncating set1, string2 must be non-empty

BusyBox tr does not complain:

$ tr a ''
a
^D
0

It should result in an error, not in some spurious output.  The attached
patch generates an error.

Matt
This commit is contained in:
Eric Andersen 2000-07-10 16:38:50 +00:00
parent 44735f8744
commit a03d86cf54
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
coreutils/tr.c
View File

@ -187,10 +187,12 @@ extern int tr_main(int argc, char **argv)
expand(argv[index++], input); expand(argv[index++], input);
if (com_fl) if (com_fl)
complement(input); complement(input);
if (argv[index] != NULL) if (argv[index] != NULL) {
if (*argv[index] == '\0')
fatalError("tr: STRING2 cannot be empty\n");
expand(argv[index], output); expand(argv[index], output);
if (argv[index] != NULL)
map(input, output); map(input, output);
}
for (ptr = input; *ptr; ptr++) for (ptr = input; *ptr; ptr++)
invec[*ptr] = TRUE; invec[*ptr] = TRUE;
for (ptr = output; *ptr; ptr++) for (ptr = output; *ptr; ptr++)

6
tr.c
View File

@ -187,10 +187,12 @@ extern int tr_main(int argc, char **argv)
expand(argv[index++], input); expand(argv[index++], input);
if (com_fl) if (com_fl)
complement(input); complement(input);
if (argv[index] != NULL) if (argv[index] != NULL) {
if (*argv[index] == '\0')
fatalError("tr: STRING2 cannot be empty\n");
expand(argv[index], output); expand(argv[index], output);
if (argv[index] != NULL)
map(input, output); map(input, output);
}
for (ptr = input; *ptr; ptr++) for (ptr = input; *ptr; ptr++)
invec[*ptr] = TRUE; invec[*ptr] = TRUE;
for (ptr = output; *ptr; ptr++) for (ptr = output; *ptr; ptr++)