From owner-svn-src-head@FreeBSD.ORG  Tue Feb 10 22:23:53 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A624A9F2;
 Tue, 10 Feb 2015 22:23:53 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 90F0F1F0;
 Tue, 10 Feb 2015 22:23:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1AMNr2V060625;
 Tue, 10 Feb 2015 22:23:53 GMT (envelope-from grembo@FreeBSD.org)
Received: (from grembo@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1AMNrW8060624;
 Tue, 10 Feb 2015 22:23:53 GMT (envelope-from grembo@FreeBSD.org)
Message-Id: <201502102223.t1AMNrW8060624@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: grembo set sender to
 grembo@FreeBSD.org using -f
From: Michael Gmelin <grembo@FreeBSD.org>
Date: Tue, 10 Feb 2015 22:23:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r278541 - head/usr.bin/w
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2015 22:23:53 -0000

Author: grembo (ports committer)
Date: Tue Feb 10 22:23:52 2015
New Revision: 278541
URL: https://svnweb.freebsd.org/changeset/base/278541

Log:
  Add xo_finish() to w.c in case it's invoked as uptime
  
  Reviewed by:	marcel
  Approved by:	marcel
  Differential Revision: https://reviews.freebsd.org/D1821

Modified:
  head/usr.bin/w/w.c

Modified: head/usr.bin/w/w.c
==============================================================================
--- head/usr.bin/w/w.c	Tue Feb 10 22:05:57 2015	(r278540)
+++ head/usr.bin/w/w.c	Tue Feb 10 22:23:52 2015	(r278541)
@@ -264,7 +264,9 @@ main(int argc, char *argv[])
 	if (header || wcmd == 0) {
 		pr_header(&now, nusers);
 		if (wcmd == 0) {
-		        xo_close_container("uptime-information");
+			xo_close_container("uptime-information");
+			xo_finish();
+
 			(void)kvm_close(kd);
 			exit(0);
 		}