From owner-svn-src-all@FreeBSD.ORG  Mon Feb 17 16:07:58 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CA638688;
 Mon, 17 Feb 2014 16:07:58 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B3A44123A;
 Mon, 17 Feb 2014 16:07:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1HG7wRR026559;
 Mon, 17 Feb 2014 16:07:58 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1HG7woK026558;
 Mon, 17 Feb 2014 16:07:58 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201402171607.s1HG7woK026558@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Mon, 17 Feb 2014 16:07:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r262076 - stable/9/usr.sbin/newsyslog
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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: Mon, 17 Feb 2014 16:07:58 -0000

Author: bdrewery
Date: Mon Feb 17 16:07:58 2014
New Revision: 262076
URL: http://svnweb.freebsd.org/changeset/base/262076

Log:
  MFC r261401:
  
    Fix newsyslog(8) to use the size of the file instead of the blocks it
    takes on disk, as advertised in newsyslog.conf(5).
  
  Approved by:	bapt (mentor, implicit)

Modified:
  stable/9/usr.sbin/newsyslog/newsyslog.c
Directory Properties:
  stable/9/usr.sbin/newsyslog/   (props changed)

Modified: stable/9/usr.sbin/newsyslog/newsyslog.c
==============================================================================
--- stable/9/usr.sbin/newsyslog/newsyslog.c	Mon Feb 17 15:57:16 2014	(r262075)
+++ stable/9/usr.sbin/newsyslog/newsyslog.c	Mon Feb 17 16:07:58 2014	(r262076)
@@ -2282,7 +2282,7 @@ sizefile(const char *file)
 
 	if (stat(file, &sb) < 0)
 		return (-1);
-	return (kbytes(dbtob(sb.st_blocks)));
+	return (kbytes(sb.st_size));
 }
 
 /*