diff options
| author | Eric Andersen <andersen@codepoet.org> | 2000-12-06 22:53:06 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2000-12-06 22:53:06 +0000 |
| commit | 8ffabf5825e68f25c08ee6d804cf8e77035ef27d (patch) | |
| tree | becf91e1b6467562965461eab3a5d9363168a2ba | |
| parent | 1d3523b7aa994aeb90fec5f281617abc3c9ce195 (diff) | |
| download | busybox-w32-8ffabf5825e68f25c08ee6d804cf8e77035ef27d.tar.gz busybox-w32-8ffabf5825e68f25c08ee6d804cf8e77035ef27d.tar.bz2 busybox-w32-8ffabf5825e68f25c08ee6d804cf8e77035ef27d.zip | |
Patch from Matt Kraai to fix 'echo "1 2 3" | tr -s " "'
so it properly outputs "1 2 3".
| -rw-r--r-- | coreutils/tr.c | 2 | ||||
| -rw-r--r-- | tr.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/coreutils/tr.c b/coreutils/tr.c index 54b6abc8c..96e2c2b5f 100644 --- a/coreutils/tr.c +++ b/coreutils/tr.c | |||
| @@ -70,7 +70,7 @@ static void convert() | |||
| 70 | coded = vector[c]; | 70 | coded = vector[c]; |
| 71 | if (del_fl && invec[c]) | 71 | if (del_fl && invec[c]) |
| 72 | continue; | 72 | continue; |
| 73 | if (sq_fl && last == coded && outvec[coded]) | 73 | if (sq_fl && last == coded && (invec[c] || outvec[coded])) |
| 74 | continue; | 74 | continue; |
| 75 | output[out_index++] = last = coded; | 75 | output[out_index++] = last = coded; |
| 76 | if (out_index == BUFSIZ) { | 76 | if (out_index == BUFSIZ) { |
| @@ -70,7 +70,7 @@ static void convert() | |||
| 70 | coded = vector[c]; | 70 | coded = vector[c]; |
| 71 | if (del_fl && invec[c]) | 71 | if (del_fl && invec[c]) |
| 72 | continue; | 72 | continue; |
| 73 | if (sq_fl && last == coded && outvec[coded]) | 73 | if (sq_fl && last == coded && (invec[c] || outvec[coded])) |
| 74 | continue; | 74 | continue; |
| 75 | output[out_index++] = last = coded; | 75 | output[out_index++] = last = coded; |
| 76 | if (out_index == BUFSIZ) { | 76 | if (out_index == BUFSIZ) { |