From 6003dc8e9b365521e7901b5d0d6fe54b5d7bd02a Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Sat, 19 Jun 1999 20:07:24 +0000 Subject: [PATCH] Move the IFSTATUS stuff after the address listing. --- sbin/ifconfig/ifconfig.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index f2ab7dec5b54..9252396f02c2 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -42,7 +42,7 @@ static const char copyright[] = static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #endif static const char rcsid[] = - "$Id: ifconfig.c,v 1.40 1999/06/06 09:17:30 phk Exp $"; + "$Id: ifconfig.c,v 1.41 1999/06/19 18:42:19 phk Exp $"; #endif /* not lint */ #include @@ -758,10 +758,6 @@ status(afp, addrcount, sdl, ifm, ifam) printf(" mtu %d", mtu); putchar('\n'); - strncpy(ifs.ifs_name, name, sizeof ifs.ifs_name); - if (ioctl(s, SIOCGIFSTATUS, &ifs) == 0) - printf("%s", ifs.ascii); - while (addrcount > 0) { info.rti_addrs = ifam->ifam_addrs; @@ -806,6 +802,10 @@ status(afp, addrcount, sdl, ifm, ifam) if (allfamilies || afp->af_status == vlan_status) vlan_status(s, NULL); #endif + strncpy(ifs.ifs_name, name, sizeof ifs.ifs_name); + if (ioctl(s, SIOCGIFSTATUS, &ifs) == 0) + printf("%s", ifs.ascii); + if (!allfamilies && !p && afp->af_status != media_status && afp->af_status != ether_status && afp->af_status != vlan_status) warnx("%s has no %s interface address!", name, afp->af_name);