From: Karel Zak <kzak@redhat.com>
Date: Tue, 29 Jul 2014 09:57:01 +0000 (+0200)
Subject: Revert "wall: wrap message header when it exceeds 79 characters"
X-Git-Tag: v2.26-rc1~573
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b928bb109a3d027d1816981b59a4502ef885b1cc;p=thirdparty%2Futil-linux.git

Revert "wall: wrap message header when it exceeds 79 characters"

This reverts commit 93d7baf250495b2385c369afd48137a7363ae4c2.

Ooops... it wasn't my plan to merge this patch. Sorry.
---

diff --git a/term-utils/wall.c b/term-utils/wall.c
index acada294a3..598e9f28c5 100644
--- a/term-utils/wall.c
+++ b/term-utils/wall.c
@@ -202,8 +202,6 @@ static char *makemsg(char *fname, char **mvec, int mvecsz,
 		char *whom, *where, *date;
 		struct passwd *pw;
 		time_t now;
-		ssize_t len;
-		int i;
 
 		if (!(whom = getlogin()) || !*whom)
 			whom = (pw = getpwuid(getuid())) ? pw->pw_name : "???";
@@ -234,10 +232,7 @@ static char *makemsg(char *fname, char **mvec, int mvecsz,
 		fprintf(fp, "\r%*s\r\n", TERM_WIDTH, " ");
 		sprintf(lbuf, _("Broadcast message from %s@%s (%s) (%s):"),
 			      whom, hostname, where, date);
-		len = strlen(lbuf);
-		for (i = 0; 0 < len; i++)
-			len -= fprintf(fp, "%-*.*s\007\007\r\n", TERM_WIDTH, TERM_WIDTH,
-				       lbuf + (i * TERM_WIDTH)) + 4;
+		fprintf(fp, "%-*.*s\007\007\r\n", TERM_WIDTH, TERM_WIDTH, lbuf);
 		free(hostname);
 		free(date);
 	}