[src/netbsd-7]: src/usr.bin/netstat Pull up following revision(s) (requested ...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/571ea5294112
branches:  netbsd-7
changeset: 799387:571ea5294112
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Jun 01 19:22:31 2015 +0000

description:
Pull up following revision(s) (requested by manu in ticket #809):
        usr.bin/netstat/route.c: revision 1.84
Make sure netstat builds with -DSMALL
src/usr.bin/netstat relies on code from src/sbin/route. WHen building
with -DSMALL, some functions such as mpls_ntoa() or p_rtrmx() are not
built in src/sbin/route. We therefore have to make sure they are not
used in src/usr.bin/netstat.

diffstat:

 usr.bin/netstat/route.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (45 lines):

diff -r 8665661d0992 -r 571ea5294112 usr.bin/netstat/route.c
--- a/usr.bin/netstat/route.c   Mon Jun 01 19:19:44 2015 +0000
+++ b/usr.bin/netstat/route.c   Mon Jun 01 19:22:31 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: route.c,v 1.82.2.1 2015/01/08 11:01:01 martin Exp $    */
+/*     $NetBSD: route.c,v 1.82.2.2 2015/06/01 19:22:31 snj Exp $       */
 
 /*
  * Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "from: @(#)route.c      8.3 (Berkeley) 3/9/94";
 #else
-__RCSID("$NetBSD: route.c,v 1.82.2.1 2015/01/08 11:01:01 martin Exp $");
+__RCSID("$NetBSD: route.c,v 1.82.2.2 2015/06/01 19:22:31 snj Exp $");
 #endif
 #endif /* not lint */
 
@@ -262,6 +262,7 @@
                printf("%6s", "-");
        putchar((rt->rt_rmx.rmx_locks & RTV_MTU) ? 'L' : ' ');
        if (tagflag == 1) {
+#ifndef SMALL
                if (rt->rt_tag != NULL) {
                        const struct sockaddr *tagsa = kgetsa(rt->rt_tag);
                        char *tagstr;
@@ -276,6 +277,7 @@
                        else
                                printf("%7s", "-");
                } else
+#endif
                        printf("%7s", "-");
        }
        if (rt->rt_ifp) {
@@ -287,8 +289,10 @@
                        rt->rt_nodes[0].rn_dupedkey ? " =>" : "");
        }
        putchar('\n');
+#ifndef SMALL
        if (vflag)
                p_rtrmx(&rt->rt_rmx);
+#endif
 }
 
 /*