Author: ru
Date: Mon Jan 19 10:44:16 2009
New Revision: 187431
URL: http://svn.freebsd.org/changeset/base/187431
Log:
MFC:
- Fix crash with "netstat -m -N foo".
PR: bin/124724
- Sync usage() with SYNOPSIS.
Modified:
stable/7/usr.bin/netstat/ (props changed)
stable/7/usr.bin/netstat/main.c
Modified: stable/7/usr.bin/netstat/main.c
==============================================================================
--- stable/7/usr.bin/netstat/main.c Mon Jan 19 08:51:20 2009
(r187430)
+++ stable/7/usr.bin/netstat/main.c Mon Jan 19 10:44:16 2009
(r187431)
@@ -503,7 +503,7 @@ main(int argc, char *argv[])
exit(0);
}
if (mflag) {
- if (memf != NULL) {
+ if (!live) {
if (kread(0, NULL, 0) == 0)
mbpr(kvmd, nl[N_MBSTAT].n_value);
} else
@@ -768,15 +768,16 @@ usage(void)
(void)fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
"usage: netstat [-AaLnSW] [-f protocol_family | -p protocol]\n"
" [-M core] [-N system]",
-" netstat -i | -I interface [-abdhnt] [-f address_family]\n"
+" netstat -i | -I interface [-abdhntW] [-f address_family]\n"
" [-M core] [-N system]",
" netstat -w wait [-I interface] [-d] [-M core] [-N system]",
-" netstat -s [-s] [-z] [-f protocol_family | -p protocol] [-M core]",
+" netstat -s [-s] [-z] [-f protocol_family | -p protocol]\n"
+" [-M core] [-N system]",
" netstat -i | -I interface -s [-f protocol_family | -p protocol]\n"
" [-M core] [-N system]",
" netstat -m [-M core] [-N system]",
-" netstat -B [ -I interface]",
-" netstat -r [-AenW] [-f address_family] [-M core] [-N system]",
+" netstat -B [-I interface]",
+" netstat -r [-AanW] [-f address_family] [-M core] [-N system]",
" netstat -rs [-s] [-M core] [-N system]",
" netstat -g [-W] [-f address_family] [-M core] [-N system]",
" netstat -gs [-s] [-f address_family] [-M core] [-N system]");
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
