From owner-svn-src-all@FreeBSD.ORG  Tue Jul 12 23:39:56 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E2F70106564A;
	Tue, 12 Jul 2011 23:39:56 +0000 (UTC)
	(envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D358E8FC0C;
	Tue, 12 Jul 2011 23:39:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6CNdupd059949;
	Tue, 12 Jul 2011 23:39:56 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6CNduKQ059947;
	Tue, 12 Jul 2011 23:39:56 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <201107122339.p6CNduKQ059947@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Tue, 12 Jul 2011 23:39:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223969 - stable/8/usr.bin/wall
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Jul 2011 23:39:57 -0000

Author: obrien
Date: Tue Jul 12 23:39:56 2011
New Revision: 223969
URL: http://svn.freebsd.org/changeset/base/223969

Log:
  MFC: r223940: If one's message is longer than the buffer size, then we reset
  'cnt' at the wrong point and the actual column # get out of sync across the
  buffer size.

Modified:
  stable/8/usr.bin/wall/wall.c
Directory Properties:
  stable/8/usr.bin/wall/   (props changed)

Modified: stable/8/usr.bin/wall/wall.c
==============================================================================
--- stable/8/usr.bin/wall/wall.c	Tue Jul 12 21:01:09 2011	(r223968)
+++ stable/8/usr.bin/wall/wall.c	Tue Jul 12 23:39:56 2011	(r223969)
@@ -251,8 +251,9 @@ makemsg(char *fname)
 			err(1, "can't read %s", fname);
 		setegid(egid);
 	}
+	cnt = 0;
 	while (fgets(lbuf, sizeof(lbuf), stdin)) {
-		for (cnt = 0, p = lbuf; (ch = *p) != '\0'; ++p, ++cnt) {
+		for (p = lbuf; (ch = *p) != '\0'; ++p, ++cnt) {
 			if (ch == '\r') {
 				putc('\r', fp);
 				cnt = 0;