diff options
author | marius <marius@FreeBSD.org> | 2007-01-22 13:42:07 +0000 |
---|---|---|
committer | marius <marius@FreeBSD.org> | 2007-01-22 13:42:07 +0000 |
commit | 710b7025d15c07e261cb11e550f6d7f9937135db (patch) | |
tree | 3fe1c05d8a126c810a223773bbcac2dbd1aaadaf /sbin | |
parent | df992b84fce88478648b3263f948f71d411bf625 (diff) | |
download | FreeBSD-src-710b7025d15c07e261cb11e550f6d7f9937135db.zip FreeBSD-src-710b7025d15c07e261cb11e550f6d7f9937135db.tar.gz |
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
Diffstat (limited to 'sbin')
-rw-r--r-- | sbin/ifconfig/ifmedia.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sbin/ifconfig/ifmedia.c b/sbin/ifconfig/ifmedia.c index df5b23e..a3d3036 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)); } /********************************************************************** |