Patch from Matt Kraai to fix 'echo "1 2 3" | tr -s " "'

so it properly outputs "1 2 3".

diff --git a/coreutils/tr.c b/coreutils/tr.c
index 54b6abc..96e2c2b 100644 (file)
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -70,7 +70,7 @@ static void convert()
                coded = vector[c];
                if (del_fl && invec[c])
                        continue;
-               if (sq_fl && last == coded && outvec[coded])
+               if (sq_fl && last == coded && (invec[c] || outvec[coded]))
                        continue;
                output[out_index++] = last = coded;
                if (out_index == BUFSIZ) {

diff --git a/tr.c b/tr.c
index 54b6abc..96e2c2b 100644 (file)
--- a/tr.c
+++ b/tr.c
@@ -70,7 +70,7 @@ static void convert()
                coded = vector[c];
                if (del_fl && invec[c])
                        continue;
-               if (sq_fl && last == coded && outvec[coded])
+               if (sq_fl && last == coded && (invec[c] || outvec[coded]))
                        continue;
                output[out_index++] = last = coded;
                if (out_index == BUFSIZ) {