Check return values of kvm_nlist() properly so that "libgtop_server"

will not abort without reason.

10 files changed, 116 insertions, 3 deletions

diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 7be6ae3a741..b43940bcc7a 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 1999/10/22 23:47:58 tron Exp $
+# $NetBSD: Makefile,v 1.25 1999/11/02 23:16:18 tron Exp $
 
 DISTNAME=		libgtop-1.0.5
 CATEGORIES=		devel gnome
@@ -17,8 +17,9 @@ USE_X11BASE=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 
+CFLAGS+=		-g
 CPPFLAGS+=		-I${LOCALBASE}/include
-LDFLAGS+=		-L${LOCALBASE}/lib -lintl
+LDFLAGS+=		-g -L${LOCALBASE}/lib -lintl
 PERL=			${LOCALBASE}/bin/perl
 
 # The following CPPFLAGS are for debugging purposes.
diff --git a/devel/libgtop/files/patch-sum b/devel/libgtop/files/patch-sum
index 1c98503e6b4..68605b59d1f 100644
--- a/devel/libgtop/files/patch-sum
+++ b/devel/libgtop/files/patch-sum
@@ -1,5 +1,13 @@
-$NetBSD: patch-sum,v 1.3 1999/10/22 23:47:58 tron Exp $
+$NetBSD: patch-sum,v 1.4 1999/11/02 23:16:20 tron Exp $
 
 MD5 (patch-aa) = ff5a586a4aaf732a48a7dc7d614683ff
 MD5 (patch-ab) = 1be0d48b1e41fea46ee459a320fb11c7
 MD5 (patch-ac) = f84a83914548206edccb11e1f84bf1bf
+MD5 (patch-ad) = 000a57829625645fbda8abfe65135923
+MD5 (patch-ae) = f235bf998e1cd767f70e86d349804d40
+MD5 (patch-af) = 54b80df824e27168b3af28ecb799728c
+MD5 (patch-ag) = 3987e191391615a7e3516f7cbc8aa8df
+MD5 (patch-ah) = f6c0bc32c3905426377361e7c0373547
+MD5 (patch-ai) = 073358fd3107c404d419d0ef70cdd26c
+MD5 (patch-aj) = 4bc9021f359aee85e93d0caa24d9c71b
+MD5 (patch-ak) = 985f207c67e0288e6692d9796b995498
diff --git a/devel/libgtop/patches/patch-ad b/devel/libgtop/patches/patch-ad
new file mode 100644
index 00000000000..0f3a0465787
--- /dev/null
+++ b/devel/libgtop/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.4 1999/11/02 23:16:20 tron Exp $
+
+--- sysdeps/freebsd/mem.c.orig	Thu May 27 20:56:47 1999
++++ sysdeps/freebsd/mem.c	Wed Nov  3 00:05:33 1999
+@@ -92,7 +92,7 @@
+ {
+ 	register int pagesize;
+ 
+-	if (kvm_nlist (server->machine.kd, nlst) != 0) {
++	if (kvm_nlist (server->machine.kd, nlst) < 0) {
+ 		glibtop_warn_io_r (server, "kvm_nlist (mem)");
+ 		return;
+ 	}
diff --git a/devel/libgtop/patches/patch-ae b/devel/libgtop/patches/patch-ae
new file mode 100644
index 00000000000..80525ad8c5f
--- /dev/null
+++ b/devel/libgtop/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.4 1999/11/02 23:16:21 tron Exp $
+
+--- sysdeps/freebsd/netload.c.orig	Thu May 27 16:03:59 1999
++++ sysdeps/freebsd/netload.c	Wed Nov  3 00:05:46 1999
+@@ -67,7 +67,7 @@
+ {
+     server->sysdeps.netload = _glibtop_sysdeps_netload;
+ 
+-    if (kvm_nlist (server->machine.kd, nlst) != 0)
++    if (kvm_nlist (server->machine.kd, nlst) < 0)
+ 	glibtop_error_io_r (server, "kvm_nlist");
+ }
+ 
diff --git a/devel/libgtop/patches/patch-af b/devel/libgtop/patches/patch-af
new file mode 100644
index 00000000000..5a712a77678
--- /dev/null
+++ b/devel/libgtop/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.4 1999/11/02 23:16:22 tron Exp $
+
+--- sysdeps/freebsd/ppp.c.orig	Thu May 27 16:04:00 1999
++++ sysdeps/freebsd/ppp.c	Wed Nov  3 00:05:51 1999
+@@ -82,7 +82,7 @@
+ #endif
+ #endif /* HAVE_I4B */
+ 
+-	if (kvm_nlist (server->machine.kd, nlst) != 0)
++	if (kvm_nlist (server->machine.kd, nlst) < 0)
+ 		glibtop_error_io_r (server, "kvm_nlist");
+ }
+ 
diff --git a/devel/libgtop/patches/patch-ag b/devel/libgtop/patches/patch-ag
new file mode 100644
index 00000000000..a9ffd1c7826
--- /dev/null
+++ b/devel/libgtop/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.4 1999/11/02 23:16:22 tron Exp $
+
+--- sysdeps/freebsd/sem_limits.c.orig	Thu May 27 16:04:13 1999
++++ sysdeps/freebsd/sem_limits.c	Wed Nov  3 00:06:02 1999
+@@ -78,7 +78,7 @@
+ void
+ glibtop_init_sem_limits_p (glibtop *server)
+ {
+-	if (kvm_nlist (server->machine.kd, nlst) != 0) {
++	if (kvm_nlist (server->machine.kd, nlst) < 0) {
+ 		glibtop_warn_io_r (server, "kvm_nlist (sem_limits)");
+ 		return;
+ 	}
diff --git a/devel/libgtop/patches/patch-ah b/devel/libgtop/patches/patch-ah
new file mode 100644
index 00000000000..b388096ce8e
--- /dev/null
+++ b/devel/libgtop/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.4 1999/11/02 23:16:23 tron Exp $
+
+--- sysdeps/freebsd/shm_limits.c.orig	Thu May 27 16:04:14 1999
++++ sysdeps/freebsd/shm_limits.c	Wed Nov  3 00:06:09 1999
+@@ -76,7 +76,7 @@
+ void
+ glibtop_init_shm_limits_p (glibtop *server)
+ {
+-	if (kvm_nlist (server->machine.kd, nlst) != 0) {
++	if (kvm_nlist (server->machine.kd, nlst) < 0) {
+ 		glibtop_warn_io_r (server, "kvm_nlist (shm_limits)");
+ 		return;
+ 	}
diff --git a/devel/libgtop/patches/patch-ai b/devel/libgtop/patches/patch-ai
new file mode 100644
index 00000000000..c53d16b30ed
--- /dev/null
+++ b/devel/libgtop/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.4 1999/11/02 23:16:24 tron Exp $
+
+--- sysdeps/freebsd/swap.c.orig	Thu May 27 20:56:53 1999
++++ sysdeps/freebsd/swap.c	Wed Nov  3 00:06:17 1999
+@@ -95,7 +95,7 @@
+ {
+ #if defined(__FreeBSD__) || defined(__bsdi__)
+ #if __FreeBSD__ < 4 || defined(__bsdi__)
+-	if (kvm_nlist (server->machine.kd, nlst) != 0) {
++	if (kvm_nlist (server->machine.kd, nlst) < 0) {
+ 		glibtop_warn_io_r (server, "kvm_nlist (swap)");
+ 		return;
+ 	}
diff --git a/devel/libgtop/patches/patch-aj b/devel/libgtop/patches/patch-aj
new file mode 100644
index 00000000000..22f03e9e628
--- /dev/null
+++ b/devel/libgtop/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.4 1999/11/02 23:16:25 tron Exp $
+
+--- sysdeps/freebsd/cpu.c.orig	Thu May 27 16:03:55 1999
++++ sysdeps/freebsd/cpu.c	Wed Nov  3 00:05:27 1999
+@@ -51,7 +51,7 @@
+ void
+ glibtop_init_cpu_p (glibtop *server)
+ {
+-	if (kvm_nlist (server->machine.kd, nlst) != 0) {
++	if (kvm_nlist (server->machine.kd, nlst) < 0) {
+ 		glibtop_warn_io_r (server, "kvm_nlist (cpu)");
+ 		return;
+ 	}
diff --git a/devel/libgtop/patches/patch-ak b/devel/libgtop/patches/patch-ak
new file mode 100644
index 00000000000..c31aacc59ec
--- /dev/null
+++ b/devel/libgtop/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.4 1999/11/02 23:16:26 tron Exp $
+
+--- sysdeps/freebsd/msg_limits.c.orig	Thu May 27 16:03:58 1999
++++ sysdeps/freebsd/msg_limits.c	Wed Nov  3 00:05:39 1999
+@@ -76,7 +76,7 @@
+ void
+ glibtop_init_msg_limits_p (glibtop *server)
+ {
+-	if (kvm_nlist (server->machine.kd, nlst) != 0) {
++	if (kvm_nlist (server->machine.kd, nlst) < 0) {
+ 		glibtop_warn_io_r (server, "kvm_nlist (msg_limits)");
+ 		return;
+ 	}