41c41
< __FBSDID("$FreeBSD: head/usr.bin/netstat/inet.c 175077 2008-01-04 03:09:28Z obrien $");
---
> __FBSDID("$FreeBSD: head/usr.bin/netstat/inet.c 179027 2008-05-15 20:18:44Z gnn $");
144a145,146
> xsb->sb_mcnt = sb->sb_mcnt;
> xsb->sb_ccnt = sb->sb_ccnt;
407a410,420
> printf((Aflag && !Wflag) ?
> "%-5.5s %-6.6s %-6.6s %-18.18s %-18.18s" :
> "%-5.5s %-6.6s %-6.6s %-22.22s %-22.22s",
> "Proto", "Recv-Q", "Send-Q",
> "Local Address", "Foreign Address");
> if (xflag)
> printf("%-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %s\n",
> "R-MBUF", "S-MBUF", "R-CLUS", "S-CLUS",
> "R-HIWA", "S-HIWA", "R-LOWA", "S-LOWA",
> "R-BCNT", "S-BCNT", "R-BMAX", "S-BMAX",
> "(state)");
409,414c422
< printf((Aflag && !Wflag) ?
< "%-5.5s %-6.6s %-6.6s %-18.18s %-18.18s %s\n" :
< "%-5.5s %-6.6s %-6.6s %-22.22s %-22.22s %s\n",
< "Proto", "Recv-Q", "Send-Q",
< "Local Address", "Foreign Address",
< "(state)");
---
> printf("(state)\n");
441c449,450
< printf("%6u %6u ", so->so_rcv.sb_cc, so->so_snd.sb_cc);
---
> printf("%6u %6u ",
> so->so_rcv.sb_cc, so->so_snd.sb_cc);
496a506,524
> if (xflag) {
> if (Lflag)
> printf("%21s %6u %6u %6u %6u %6u %6u %6u %6u %6u %6u %6u %6u ",
> " ",
> so->so_rcv.sb_mcnt, so->so_snd.sb_mcnt,
> so->so_rcv.sb_ccnt, so->so_snd.sb_ccnt,
> so->so_rcv.sb_hiwat, so->so_snd.sb_hiwat,
> so->so_rcv.sb_lowat, so->so_snd.sb_lowat,
> so->so_rcv.sb_mbcnt, so->so_snd.sb_mbcnt,
> so->so_rcv.sb_mbmax, so->so_snd.sb_mbmax);
> else
> printf("%6u %6u %6u %6u %6u %6u %6u %6u %6u %6u %6u %6u ",
> so->so_rcv.sb_mcnt, so->so_snd.sb_mcnt,
> so->so_rcv.sb_ccnt, so->so_snd.sb_ccnt,
> so->so_rcv.sb_hiwat, so->so_snd.sb_hiwat,
> so->so_rcv.sb_lowat, so->so_snd.sb_lowat,
> so->so_rcv.sb_mbcnt, so->so_snd.sb_mbcnt,
> so->so_rcv.sb_mbmax, so->so_snd.sb_mbmax);
> }
500c528
< else {
---
> else {
508c536
< }
---
> }
< __FBSDID("$FreeBSD: head/usr.bin/netstat/inet.c 175077 2008-01-04 03:09:28Z obrien $");
---
> __FBSDID("$FreeBSD: head/usr.bin/netstat/inet.c 179027 2008-05-15 20:18:44Z gnn $");
144a145,146
> xsb->sb_mcnt = sb->sb_mcnt;
> xsb->sb_ccnt = sb->sb_ccnt;
407a410,420
> printf((Aflag && !Wflag) ?
> "%-5.5s %-6.6s %-6.6s %-18.18s %-18.18s" :
> "%-5.5s %-6.6s %-6.6s %-22.22s %-22.22s",
> "Proto", "Recv-Q", "Send-Q",
> "Local Address", "Foreign Address");
> if (xflag)
> printf("%-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %s\n",
> "R-MBUF", "S-MBUF", "R-CLUS", "S-CLUS",
> "R-HIWA", "S-HIWA", "R-LOWA", "S-LOWA",
> "R-BCNT", "S-BCNT", "R-BMAX", "S-BMAX",
> "(state)");
409,414c422
< printf((Aflag && !Wflag) ?
< "%-5.5s %-6.6s %-6.6s %-18.18s %-18.18s %s\n" :
< "%-5.5s %-6.6s %-6.6s %-22.22s %-22.22s %s\n",
< "Proto", "Recv-Q", "Send-Q",
< "Local Address", "Foreign Address",
< "(state)");
---
> printf("(state)\n");
441c449,450
< printf("%6u %6u ", so->so_rcv.sb_cc, so->so_snd.sb_cc);
---
> printf("%6u %6u ",
> so->so_rcv.sb_cc, so->so_snd.sb_cc);
496a506,524
> if (xflag) {
> if (Lflag)
> printf("%21s %6u %6u %6u %6u %6u %6u %6u %6u %6u %6u %6u %6u ",
> " ",
> so->so_rcv.sb_mcnt, so->so_snd.sb_mcnt,
> so->so_rcv.sb_ccnt, so->so_snd.sb_ccnt,
> so->so_rcv.sb_hiwat, so->so_snd.sb_hiwat,
> so->so_rcv.sb_lowat, so->so_snd.sb_lowat,
> so->so_rcv.sb_mbcnt, so->so_snd.sb_mbcnt,
> so->so_rcv.sb_mbmax, so->so_snd.sb_mbmax);
> else
> printf("%6u %6u %6u %6u %6u %6u %6u %6u %6u %6u %6u %6u ",
> so->so_rcv.sb_mcnt, so->so_snd.sb_mcnt,
> so->so_rcv.sb_ccnt, so->so_snd.sb_ccnt,
> so->so_rcv.sb_hiwat, so->so_snd.sb_hiwat,
> so->so_rcv.sb_lowat, so->so_snd.sb_lowat,
> so->so_rcv.sb_mbcnt, so->so_snd.sb_mbcnt,
> so->so_rcv.sb_mbmax, so->so_snd.sb_mbmax);
> }
500c528
< else {
---
> else {
508c536
< }
---
> }