From owner-svn-soc-all@FreeBSD.ORG  Mon Aug  4 09:32:39 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-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 23798D53
 for <svn-soc-all@FreeBSD.org>; Mon,  4 Aug 2014 09:32:39 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DE4EA2D2D
 for <svn-soc-all@FreeBSD.org>; Mon,  4 Aug 2014 09:32:38 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s749Wc0t041612
 for <svn-soc-all@FreeBSD.org>; Mon, 4 Aug 2014 09:32:38 GMT
 (envelope-from zkorchev@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s749Wc6r041433
 for svn-soc-all@FreeBSD.org; Mon, 4 Aug 2014 09:32:38 GMT
 (envelope-from zkorchev@FreeBSD.org)
Date: Mon, 4 Aug 2014 09:32:38 GMT
Message-Id: <201408040932.s749Wc6r041433@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 zkorchev@FreeBSD.org using -f
From: zkorchev@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r271839 - soc2014/zkorchev/freebsd_head/usr.bin/w
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Aug 2014 09:32:39 -0000

Author: zkorchev
Date: Mon Aug  4 09:32:37 2014
New Revision: 271839
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271839

Log:
  uncommited w structured output fix

Modified:
  soc2014/zkorchev/freebsd_head/usr.bin/w/Makefile
  soc2014/zkorchev/freebsd_head/usr.bin/w/w.c

Modified: soc2014/zkorchev/freebsd_head/usr.bin/w/Makefile
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/w/Makefile	Mon Aug  4 09:31:39 2014	(r271838)
+++ soc2014/zkorchev/freebsd_head/usr.bin/w/Makefile	Mon Aug  4 09:32:37 2014	(r271839)
@@ -4,7 +4,7 @@
 PROG=	w
 SRCS=	fmt.c pr_time.c proc_compare.c w.c
 MAN=	w.1 uptime.1
-CFLAGS+=-DSOL_ON -I/usr/local/include
+CFLAGS+=-DSOL_ON
 DPADD=	${LIBKVM} ${LIBUTIL}
 LDADD=	-lkvm -lutil -lsol
 #BINGRP= kmem

Modified: soc2014/zkorchev/freebsd_head/usr.bin/w/w.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/w/w.c	Mon Aug  4 09:31:39 2014	(r271838)
+++ soc2014/zkorchev/freebsd_head/usr.bin/w/w.c	Mon Aug  4 09:32:37 2014	(r271839)
@@ -436,6 +436,7 @@
 #if defined(SOL_ON)
 		if (sol_format)
 		{
+			sol_map_start(&sol_stream);
 			SOL_MAP_KEYL(&sol_stream, "user");
 			sol_string(&sol_stream, ep->utmp.ut_user, strlen(ep->utmp.ut_user));
 			if (*ep->utmp.ut_line) {
@@ -470,6 +471,7 @@
 		if (sol_format) {
 			SOL_MAP_KEYL(&sol_stream, "what");
 			sol_string(&sol_stream, ep->args, strlen(ep->args));
+			sol_map_end(&sol_stream);
 		}
 		else
 #endif