From owner-svn-src-all@FreeBSD.ORG  Sun Dec 21 21:54:02 2008
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 2C570106564A;
	Sun, 21 Dec 2008 21:54:02 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1B6F38FC17;
	Sun, 21 Dec 2008 21:54:02 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBLLs16w043240;
	Sun, 21 Dec 2008 21:54:01 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBLLs1Vx043239;
	Sun, 21 Dec 2008 21:54:01 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200812212154.mBLLs1Vx043239@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sun, 21 Dec 2008 21:54:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186383 - head/sys/kern
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: Sun, 21 Dec 2008 21:54:02 -0000

Author: ed
Date: Sun Dec 21 21:54:01 2008
New Revision: 186383
URL: http://svn.freebsd.org/changeset/base/186383

Log:
  Revert r185891.
  
  In r185891 I removed the newlines from messages written to /dev/console,
  because it made startup messages from rc-scripts harder to read. This,
  unfortunately, causes the kernel message that is printed after a
  non-terminated log message to be concatenated.
  
  This could be fixed, but on short term it's better to just revert the
  change.
  
  Reported by:	Jaakko Heinonen <jh saunalahti fi>

Modified:
  head/sys/kern/subr_prf.c

Modified: head/sys/kern/subr_prf.c
==============================================================================
--- head/sys/kern/subr_prf.c	Sun Dec 21 21:16:57 2008	(r186382)
+++ head/sys/kern/subr_prf.c	Sun Dec 21 21:54:01 2008	(r186383)
@@ -257,7 +257,7 @@ log(int level, const char *fmt, ...)
 void
 log_console(struct uio *uio)
 {
-	int c, i, error;
+	int c, i, error, nl;
 	char *consbuffer;
 	int pri;
 
@@ -268,14 +268,22 @@ log_console(struct uio *uio)
 	uio = cloneuio(uio);
 	consbuffer = malloc(CONSCHUNK, M_TEMP, M_WAITOK);
 
+	nl = 0;
 	while (uio->uio_resid > 0) {
 		c = imin(uio->uio_resid, CONSCHUNK);
 		error = uiomove(consbuffer, c, uio);
 		if (error != 0)
 			break;
-		for (i = 0; i < c; i++)
+		for (i = 0; i < c; i++) {
 			msglogchar(consbuffer[i], pri);
+			if (consbuffer[i] == '\n')
+				nl = 1;
+			else
+				nl = 0;
+		}
 	}
+	if (!nl)
+		msglogchar('\n', pri);
 	msgbuftrigger = 1;
 	free(uio, M_IOV);
 	free(consbuffer, M_TEMP);