BSD 4_4_Lite1 release

[unix-history] / usr / src / bin / ps / nlist.c

diff --git a/usr/src/bin/ps/nlist.c b/usr/src/bin/ps/nlist.c
index 0e18623..11199ca 100644 (file)
--- a/usr/src/bin/ps/nlist.c
+++ b/usr/src/bin/ps/nlist.c
@@ -1,24 +1,55 @@
 /*-
 /*-

- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993, 1994
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)nlist.c    5.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)nlist.c    8.4 (Berkeley) 4/2/94";

 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/proc.h>
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/proc.h>

-#include <nlist.h>
+#include <sys/resource.h>
+
+#include <err.h>

 #include <errno.h>
 #include <errno.h>

+#include <kvm.h>
+#include <nlist.h>

 #include <stdio.h>
 #include <string.h>
 #include <stdio.h>
 #include <string.h>

-#include <kvm.h>

 
 

-#ifdef SPPWAIT
+#include "ps.h"
+
+#ifdef P_PPWAIT

 #define NEWVM
 #endif
 
 #define NEWVM
 #endif
 


@@ -49,9 +80,9 @@ extern kvm_t *kd;
 #define kread(x, v) \
        kvm_read(kd, psnl[x].n_value, (char *)&v, sizeof v) != sizeof(v)
 
 #define kread(x, v) \
        kvm_read(kd, psnl[x].n_value, (char *)&v, sizeof v) != sizeof(v)
 

+int

 donlist()
 {
 donlist()
 {

-       extern int eval;

        int rval;
 #ifdef NEWVM
        int tmp;
        int rval;
 #ifdef NEWVM
        int tmp;


@@ -62,43 +93,44 @@ donlist()
        if (kvm_nlist(kd, psnl)) {
                nlisterr(psnl);
                eval = 1;
        if (kvm_nlist(kd, psnl)) {
                nlisterr(psnl);
                eval = 1;

-               return(1);
+               return (1);

        }
        if (kread(X_FSCALE, fscale)) {
        }
        if (kread(X_FSCALE, fscale)) {

-               (void)fprintf(stderr, "ps: fscale: %s\n", kvm_geterr(kd));
+               warnx("fscale: %s", kvm_geterr(kd));

                eval = rval = 1;
        }
 #ifdef NEWVM
        if (kread(X_AVAILEND, mempages)) {
                eval = rval = 1;
        }
 #ifdef NEWVM
        if (kread(X_AVAILEND, mempages)) {

-               (void)fprintf(stderr, "ps: avail_start: %s\n", kvm_geterr(kd));
+               warnx("avail_start: %s", kvm_geterr(kd));

                eval = rval = 1;
        }
        if (kread(X_AVAILSTART, tmp)) {
                eval = rval = 1;
        }
        if (kread(X_AVAILSTART, tmp)) {

-               (void)fprintf(stderr, "ps: avail_end: %s\n", kvm_geterr(kd));
+               warnx("avail_end: %s", kvm_geterr(kd));

                eval = rval = 1;
        }
        mempages -= tmp;
 #else
        if (kread(X_ECMX, mempages)) {
                eval = rval = 1;
        }
        mempages -= tmp;
 #else
        if (kread(X_ECMX, mempages)) {

-               (void)fprintf(stderr, "ps: ecmx: %s\n", kvm_geterr(kd));
+               warnx("ecmx: %s", kvm_geterr(kd));

                eval = rval = 1;
        }
 #endif
        if (kread(X_CCPU, ccpu)) {
                eval = rval = 1;
        }
 #endif
        if (kread(X_CCPU, ccpu)) {

-               (void)fprintf(stderr, "ps: ccpu: %s\n", kvm_geterr(kd));
+               warnx("ccpu: %s", kvm_geterr(kd));

                eval = rval = 1;
        }
                eval = rval = 1;
        }

-       return(rval);
+       return (rval);

 }
 
 }
 

+void

 nlisterr(nl)
        struct nlist nl[];
 {
        int i;
 
 nlisterr(nl)
        struct nlist nl[];
 {
        int i;
 

-       fprintf(stderr, "ps: nlist: can't find following symbols:");
+       (void)fprintf(stderr, "ps: nlist: can't find following symbols:");

        for (i = 0; nl[i].n_name != NULL; i++)
                if (nl[i].n_value == 0)
        for (i = 0; nl[i].n_name != NULL; i++)
                if (nl[i].n_value == 0)

-                       fprintf(stderr, " %s", nl[i].n_name);
-       fprintf(stderr, "\n");
+                       (void)fprintf(stderr, " %s", nl[i].n_name);
+       (void)fprintf(stderr, "\n");

 }
 }