[src/trunk]: src/usr.bin/netstat Fix a bug introduced in rev. 1.62; it fails ...

[enami <enami%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a602c4fb8973
branches:  trunk
changeset: 332801:a602c4fb8973
user:      enami <enami%NetBSD.org@localhost>
date:      Thu Oct 09 23:45:47 2014 +0000

description:
Fix a bug introduced in rev. 1.62; it fails to negate (a && b).

diffstat:

 usr.bin/netstat/main.c |  13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 29a4e66a5032 -r a602c4fb8973 usr.bin/netstat/main.c
--- a/usr.bin/netstat/main.c    Thu Oct 09 19:33:43 2014 +0000
+++ b/usr.bin/netstat/main.c    Thu Oct 09 23:45:47 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.91 2014/05/30 01:44:21 rmind Exp $  */
+/*     $NetBSD: main.c,v 1.92 2014/10/09 23:45:47 enami Exp $  */
 
 /*
  * Copyright (c) 1983, 1988, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "from: @(#)main.c       8.4 (Berkeley) 3/1/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.91 2014/05/30 01:44:21 rmind Exp $");
+__RCSID("$NetBSD: main.c,v 1.92 2014/10/09 23:45:47 enami Exp $");
 #endif
 #endif /* not lint */
 
@@ -344,12 +344,17 @@
        /*
         * Try to figure out if we can use sysctl or not.
         */
-       if (nf != NULL && mf != NULL) {
+       if (nf != NULL || mf != NULL) {
                /* Of course, we can't use sysctl with dumps. */
                if (force_sysctl)
                        errx(EXIT_FAILURE, "can't use sysctl with dumps");
 
-               /* If we have -M and -N, we're not dealing with live memory. */
+               /*
+                * If we have -M or -N, we're not dealing with live memory
+                * or want to use kvm interface explicitly.  It is sometimes
+                * useful to dig inside of kernel without extending
+                * sysctl interface (i.e., without rebuilding kernel).
+                */
                use_sysctl = 0;
        } else if (qflag ||
                   iflag ||