sbase

suckless unix tools
git clone git://git.2f30.org/sbase.git
Log | Files | Refs | README | LICENSE

commit 9de401a495701836d744dc6c55ff62f361369753
parent fac091b7cc918f2a7c4c20038141efc2279f03c7
Author: FRIGN <dev@frign.de>
Date:   Wed Oct  5 19:31:50 +0200

Fix tr(1) squeezing

Okay, it took me a while and another look at the Posix spec to see that
I have been dealing with squeezing in a way too complicated way.
What just needed to be done is before doing the final write to deploy
the squeeze-check. We actually do not need this atomically complicated
squeeze check in every single edge-case. Now it should work properly.

Diffstat:
tr.c | 20++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/tr.c b/tr.c @@ -213,7 +213,7 @@ read: for (i = 0; i < set1ranges; i++) { if (set1[i].start <= r && r <= set1[i].end) { if (dflag) { - if (!cflag || (sflag && r == lastrune)) + if (!cflag) goto read; else goto write; @@ -244,13 +244,7 @@ read: } if (set1check && set1check(r)) { if (dflag) { - if (!cflag || (sflag && r == lastrune)) - goto read; - else - goto write; - } - if (sflag) { - if (r == lastrune) + if (!cflag) goto read; else goto write; @@ -268,9 +262,15 @@ read: } if (dflag && cflag) goto read; - if (dflag && sflag && r == lastrune) - goto read; write: + if (sflag && r == lastrune) { + if (set2check && set2check(r)) + goto read; + for (i = 0; i < set2ranges; i++) { + if (set2[i].start <= r && r <= set2[i].end) + goto read; + } + } lastrune = r; efputrune(&r, stdout, "<stdout>"); goto read;