From owner-svn-src-head@freebsd.org  Fri Nov 20 12:15:59 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CEF52A323B5;
 Fri, 20 Nov 2015 12:15:59 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 9C36B1A55;
 Fri, 20 Nov 2015 12:15:59 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAKCFwcF066271;
 Fri, 20 Nov 2015 12:15:58 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAKCFwnX066270;
 Fri, 20 Nov 2015 12:15:58 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201511201215.tAKCFwnX066270@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Fri, 20 Nov 2015 12:15:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r291096 - head/usr.bin/netstat
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.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Nov 2015 12:15:59 -0000

Author: ume
Date: Fri Nov 20 12:15:58 2015
New Revision: 291096
URL: https://svnweb.freebsd.org/changeset/base/291096

Log:
  Avoid core dump when output style is html.

Modified:
  head/usr.bin/netstat/if.c

Modified: head/usr.bin/netstat/if.c
==============================================================================
--- head/usr.bin/netstat/if.c	Fri Nov 20 09:37:04 2015	(r291095)
+++ head/usr.bin/netstat/if.c	Fri Nov 20 12:15:58 2015	(r291096)
@@ -358,8 +358,8 @@ intpr(void (*pfunc)(char *), int af)
 		} else
 			xname = name;
 
-		xo_emit("{etk:name/%s}{eq:flags/0x%x}{d:/%-*.*s}",
-		    name, ifa->ifa_flags, ifn_len_max, ifn_len_max, xname);
+		xo_emit("{d:/%-*.*s}{etk:name}{eq:flags/0x%x}",
+		    ifn_len_max, ifn_len_max, xname, name, ifa->ifa_flags);
 
 #define IFA_MTU(ifa)	(((struct if_data *)(ifa)->ifa_data)->ifi_mtu)
 		show_stat("lu", 6, "mtu", IFA_MTU(ifa), IFA_MTU(ifa), 0);
@@ -379,15 +379,13 @@ intpr(void (*pfunc)(char *), int af)
 			nn = netname(ifa->ifa_addr, ifa->ifa_netmask);
 			rn = routename(ifa->ifa_addr, numeric_addr);
 			if (Wflag) {
-				xo_emit("{et:network/%s}{d:/%-*s} ",
-				    nn, net_len, nn);
-				xo_emit("{et:address/%s}{d:/%-*s} ",
-				    rn, addr_len, rn);
+				xo_emit("{t:network/%-*s} ", net_len, nn);
+				xo_emit("{t:address/%-*s} ", addr_len, rn);
 			} else {
-				xo_emit("{et:network/%s}{d:/%-*.*s} ",
-				    nn, net_len, net_len, nn);
-				xo_emit("{et:address/%s}{d:/%-*.*s} ",
-				    rn, addr_len, addr_len, rn);
+				xo_emit("{d:network/%-*.*s}{et:network} ",
+				    net_len, net_len, nn, nn);
+				xo_emit("{d:address/%-*.*s}{et:address} ",
+				    addr_len, addr_len, rn, rn);
 			}
 
 			network = true;