From 98b0eedaf5e8d86ab08759e939f1ae093ee266a5 Mon Sep 17 00:00:00 2001 From: Marius Strobl Date: Mon, 22 Jan 2007 13:42:07 +0000 Subject: [PATCH] Actually fully emulate NetBSD and print the media instance number only for non-zero instances so the typical output for IFM_IEEE80211 type media doesn't overflow 80 columns. Requested by: sam --- sbin/ifconfig/ifmedia.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/ifmedia.c b/sbin/ifconfig/ifmedia.c index df5b23eabaa5..a3d3036b28ce 100644 --- a/sbin/ifconfig/ifmedia.c +++ b/sbin/ifconfig/ifmedia.c @@ -739,7 +739,7 @@ print_media_word(int ifmw, int print_toptype) } printf("%s", seen_option ? ">" : ""); - if (print_toptype) + if (print_toptype && IFM_INST(ifmw) != 0) printf(" instance %d", IFM_INST(ifmw)); } @@ -788,7 +788,8 @@ print_media_word_ifconfig(int ifmw) } } - printf(" instance %d", IFM_INST(ifmw)); + if (IFM_INST(ifmw) != 0) + printf(" instance %d", IFM_INST(ifmw)); } /**********************************************************************