From owner-svn-src-all@FreeBSD.ORG  Fri Apr  2 14:30:56 2010
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 800811065678;
	Fri,  2 Apr 2010 14:30:56 +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 700F58FC1F;
	Fri,  2 Apr 2010 14:30:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o32EUugC083890;
	Fri, 2 Apr 2010 14:30:56 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o32EUuXc083888;
	Fri, 2 Apr 2010 14:30:56 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201004021430.o32EUuXc083888@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Fri, 2 Apr 2010 14:30:56 +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: r206095 - head/usr.sbin/ac
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: Fri, 02 Apr 2010 14:30:56 -0000

Author: ed
Date: Fri Apr  2 14:30:56 2010
New Revision: 206095
URL: http://svn.freebsd.org/changeset/base/206095

Log:
  Properly initialize the timestamp when using ac -w.
  
  When using ac -w, we must use the last timestamp to terminate the log
  file. I accidentally removed this when I ported the code to use utmpx.
  
  Reported by:	avg

Modified:
  head/usr.sbin/ac/ac.c

Modified: head/usr.sbin/ac/ac.c
==============================================================================
--- head/usr.sbin/ac/ac.c	Fri Apr  2 14:03:43 2010	(r206094)
+++ head/usr.sbin/ac/ac.c	Fri Apr  2 14:30:56 2010	(r206095)
@@ -583,10 +583,11 @@ ac(const char *file)
 	endutxent();
 	if (!(Flags & AC_W))
 		usht.ut_tv.tv_sec = time(NULL);
+	else
+		usht.ut_tv.tv_sec = ut_timecopy;;
 	usht.ut_type = SHUTDOWN_TIME;
 
 	if (Flags & AC_D) {
-		ut_timecopy = usht.ut_tv.tv_sec;
 		ltm = localtime(&ut_timecopy);
 		if (day >= 0 && day != ltm->tm_yday) {
 			/*