From c87eca8b085f9b7b91f5ee352d03e2bbc89c88e2 Mon Sep 17 00:00:00 2001 From: Daniel Baker Date: Wed, 1 Sep 1999 23:07:29 +0000 Subject: column counter (cnt) not reset to 0 on display of '\r' which could cause unnecessary forced linewraps on some terminals. Submitted by: David McNett --- usr.bin/wall/wall.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'usr.bin/wall') diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c index c853e1c40dab..941211963d7e 100644 --- a/usr.bin/wall/wall.c +++ b/usr.bin/wall/wall.c @@ -182,7 +182,9 @@ makemsg(fname) errx(1, "can't read %s", fname); while (fgets(lbuf, sizeof(lbuf), stdin)) for (cnt = 0, p = lbuf; (ch = *p) != '\0'; ++p, ++cnt) { - if (cnt == 79 || ch == '\n') { + if (ch == '\r') { + cnt = 0; + } else if (cnt == 79 || ch == '\n') { for (; cnt < 79; ++cnt) putc(' ', fp); putc('\r', fp); @@ -217,6 +219,7 @@ makemsg(fname) cnt = 0; } } + putc(ch, fp); } else { putc(ch, fp); } -- cgit v1.3