[src/netbsd-1-5]: src/usr.bin/systat Pull up the following revisions, approve...

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

details:   https://anonhg.NetBSD.org/src/rev/8c52fbc44969
branches:  netbsd-1-5
changeset: 489349:8c52fbc44969
user:      ad <ad%NetBSD.org@localhost>
date:      Fri Sep 01 16:38:18 2000 +0000

description:
Pull up the following revisions, approved by releng-1-5:

- Add "boot", "run", "time" and "zero" commands to all IP displays. These work
  as in the "vmstat" display mode. The default mode is now "time", not "boot".
- ANSIfy.
- s@kre\(@vmstat\(@.
- __RCSID() police.
- Tweak inet.icmp display visual a little.

netstat.c        1.19
pigs.c           1.20
ps.c             1.16
swap.c           1.13
systat.1         1.20
systat.h         1.7
tcp.c            1.7
vmstat.c         1.33

diffstat:

 usr.bin/systat/netstat.c |  78 +++++++++++++------------------------
 usr.bin/systat/pigs.c    |  22 ++++-----
 usr.bin/systat/ps.c      |  56 +++++++++++----------------
 usr.bin/systat/swap.c    |  20 ++++----
 usr.bin/systat/systat.1  |  40 ++++++++++--------
 usr.bin/systat/systat.h  |  20 ++++----
 usr.bin/systat/tcp.c     |  98 +++++++++++++++++++++++++++++++++++++++++++----
 usr.bin/systat/vmstat.c  |  67 +++++++++++++-------------------
 8 files changed, 218 insertions(+), 183 deletions(-)

diffs (truncated from 1002 to 300 lines):

diff -r febb64eb98c3 -r 8c52fbc44969 usr.bin/systat/netstat.c
--- a/usr.bin/systat/netstat.c  Fri Sep 01 16:37:08 2000 +0000
+++ b/usr.bin/systat/netstat.c  Fri Sep 01 16:38:18 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netstat.c,v 1.18 2000/04/27 00:30:51 jdc Exp $ */
+/*     $NetBSD: netstat.c,v 1.18.4.1 2000/09/01 16:38:18 ad Exp $      */
 
 /*-
  * Copyright (c) 1980, 1992, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)netstat.c  8.1 (Berkeley) 6/6/93";
 #endif
-__RCSID("$NetBSD: netstat.c,v 1.18 2000/04/27 00:30:51 jdc Exp $");
+__RCSID("$NetBSD: netstat.c,v 1.18.4.1 2000/09/01 16:38:18 ad Exp $");
 #endif /* not lint */
 
 /*
@@ -84,15 +84,15 @@
 #include "systat.h"
 #include "extern.h"
 
-static void fetchnetstat4 __P((void *, int));
-static void enter __P((struct inpcb *, struct socket *, int, char *));
-static const char *inetname __P((struct in_addr));
-static void inetprint __P((struct in_addr *, int, char *));
+static void fetchnetstat4(void *, int);
+static void enter(struct inpcb *, struct socket *, int, char *);
+static const char *inetname(struct in_addr);
+static void inetprint(struct in_addr *, int, char *);
 #ifdef INET6
-static void fetchnetstat6 __P((void *, int));
-static void enter6 __P((struct in6pcb *, struct socket *, int, char *));
-static const char *inet6name __P((struct in6_addr *));
-static void inet6print __P((struct in6_addr *, int, char *));
+static void fetchnetstat6(void *, int);
+static void enter6(struct in6pcb *, struct socket *, int, char *);
+static const char *inet6name(struct in6_addr *);
+static void inet6print(struct in6_addr *, int, char *);
 #endif
 
 #define        streq(a,b)      (strcmp(a,b)==0)
@@ -130,7 +130,7 @@
 static int lastrow = 1;
 
 WINDOW *
-opennetstat()
+opennetstat(void)
 {
 
        sethostent(1);
@@ -139,8 +139,7 @@
 }
 
 void
-closenetstat(w)
-       WINDOW *w;
+closenetstat(WINDOW *w)
 {
        struct netinfo *p;
 
@@ -175,7 +174,7 @@
 };
 
 int
-initnetstat()
+initnetstat(void)
 {
        int n;
 
@@ -194,7 +193,7 @@
 }
 
 void
-fetchnetstat()
+fetchnetstat(void)
 {
        struct netinfo *p;
 
@@ -220,9 +219,7 @@
 }
 
 static void
-fetchnetstat4(off, istcp)
-       void *off;
-       int istcp;
+fetchnetstat4(void *off, int istcp)
 {
        struct inpcbtable pcbtable;
        struct inpcb *head, *prev, *next;
@@ -264,9 +261,7 @@
 
 #ifdef INET6
 static void
-fetchnetstat6(off, istcp)
-       void *off;
-       int istcp;
+fetchnetstat6(void *off, int istcp)
 {
        struct netinfo *p;
        struct socket sockb;
@@ -307,11 +302,7 @@
 #endif /*INET6*/
 
 static void
-enter(inp, so, state, proto)
-       struct inpcb *inp;
-       struct socket *so;
-       int state;
-       char *proto;
+enter(struct inpcb *inp, struct socket *so, int state, char *proto)
 {
        struct netinfo *p;
 
@@ -360,11 +351,7 @@
 
 #ifdef INET6
 static void
-enter6(in6p, so, state, proto)
-       struct in6pcb *in6p;
-       struct socket *so;
-       int state;
-       char *proto;
+enter6(struct in6pcb *in6p, struct socket *so, int state, char *proto)
 {
        struct netinfo *p;
 
@@ -421,7 +408,7 @@
 #define        STATE   SNDCC+7
 
 void
-labelnetstat()
+labelnetstat(void)
 {
 
        if (namelist[X_TCBTABLE].n_type == 0)
@@ -436,7 +423,7 @@
 }
 
 void
-shownetstat()
+shownetstat(void)
 {
        struct netinfo *p, *q;
 
@@ -539,10 +526,7 @@
  * If the nflag was specified, use numbers instead of names.
  */
 static void
-inetprint(in, port, proto)
-       struct in_addr *in;
-       int port;
-       char *proto;
+inetprint(struct in_addr *in, int port, char *proto)
 {
        struct servent *sp = 0;
        char line[80], *cp;
@@ -567,10 +551,7 @@
 
 #ifdef INET6
 static void
-inet6print(in6, port, proto)
-       struct in6_addr *in6;
-       int port;
-       char *proto;
+inet6print(struct in6_addr *in6, int port, char *proto)
 {
        struct servent *sp = 0;
        char line[80], *cp;
@@ -600,8 +581,7 @@
  * numeric value, otherwise try for symbolic name.
  */
 static const char *
-inetname(in)
-       struct in_addr in;
+inetname(struct in_addr in)
 {
        char *cp = 0;
        static char line[50];
@@ -641,8 +621,7 @@
 
 #ifdef INET6
 static const char *
-inet6name(in6)
-       struct in6_addr *in6;
+inet6name(struct in6_addr *in6)
 {
        static char line[NI_MAXHOST];
        struct sockaddr_in6 sin6;
@@ -668,8 +647,7 @@
 /* please note: there are also some netstat commands in netcmds.c */
 
 void
-netstat_all (args)
-       char *args;
+netstat_all(char *args)
 {
        aflag = !aflag;
        fetchnetstat();
@@ -678,8 +656,7 @@
 }
 
 void
-netstat_names (args)
-       char *args;
+netstat_names(char *args)
 {
        struct netinfo *p;
 
@@ -700,8 +677,7 @@
 }
 
 void
-netstat_numbers (args)
-       char *args;
+netstat_numbers(char *args)
 {
        struct netinfo *p;
 
diff -r febb64eb98c3 -r 8c52fbc44969 usr.bin/systat/pigs.c
--- a/usr.bin/systat/pigs.c     Fri Sep 01 16:37:08 2000 +0000
+++ b/usr.bin/systat/pigs.c     Fri Sep 01 16:38:18 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pigs.c,v 1.19 2000/06/04 18:29:13 mycroft Exp $        */
+/*     $NetBSD: pigs.c,v 1.19.2.1 2000/09/01 16:38:18 ad Exp $ */
 
 /*-
  * Copyright (c) 1980, 1992, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)pigs.c     8.2 (Berkeley) 9/23/93";
 #endif
-__RCSID("$NetBSD: pigs.c,v 1.19 2000/06/04 18:29:13 mycroft Exp $");
+__RCSID("$NetBSD: pigs.c,v 1.19.2.1 2000/09/01 16:38:18 ad Exp $");
 #endif /* not lint */
 
 /*
@@ -64,7 +64,7 @@
 #include "systat.h"
 #include "ps.h"
 
-int compare_pctcpu __P((const void *, const void *));
+int compare_pctcpu(const void *, const void *);
 
 int nproc;
 struct p_times *pt;
@@ -79,15 +79,14 @@
 #endif
 
 WINDOW *
-openpigs()
+openpigs(void)
 {
 
        return (subwin(stdscr, LINES-5-1, 0, 5, 0));
 }
 
 void
-closepigs(w)
-       WINDOW *w;
+closepigs(WINDOW *w)
 {
 
        if (w == NULL)
@@ -99,7 +98,7 @@
 
 
 void
-showpigs()
+showpigs(void)
 {
        int i, y, k;
        struct  eproc *ep;
@@ -161,7 +160,7 @@
 };
 
 int
-initpigs()
+initpigs(void)
 {
        fixpt_t ccpu;
 
@@ -185,7 +184,7 @@
 }
 
 void
-fetchpigs()
+fetchpigs(void)
 {
        int i;
        float time;
@@ -244,7 +243,7 @@
 }
 
 void
-labelpigs()
+labelpigs(void)
 {
        wmove(wnd, 0, 0);
        wclrtoeol(wnd);