make ps and top use sanity checking kernel proc table retrieval

diff --git a/commands/ps/ps.c b/commands/ps/ps.c
index 72b397a484399df0b0e13fe224213426ac6cb247..3be29248296007144f3e68d99b47807e929b0021 100644 (file)
--- a/commands/ps/ps.c
+++ b/commands/ps/ps.c
@@ -344,8 +344,8 @@ char *argv[];
   if (ps_proc == NULL || ps_mproc == NULL || ps_fproc == NULL)
        err("Out of memory");
 
-       if(getsysinfo(PM_PROC_NR, SI_KPROC_TAB, ps_proc) < 0) {
-               fprintf(stderr, "getsysinfo() for SI_KPROC_TAB failed.\n");
+       if(minix_getkproctab(ps_proc, nr_tasks + nr_procs, 1) < 0) {
+               fprintf(stderr, "minix_getkproctab failed.\n");
                exit(1);
        }
 

diff --git a/commands/top/top.c b/commands/top/top.c
index f63d3bf6831f95d8428fea885c98a08bc83521de..fa19dc665b946dc3ef47718e579285ff8af19a43 100644 (file)
--- a/commands/top/top.c
+++ b/commands/top/top.c
@@ -358,10 +358,11 @@ void showtop(int r)
 #endif
 
 retry:
-       if(getsysinfo(PM_PROC_NR, SI_KPROC_TAB, proc) < 0) {
-               fprintf(stderr, "getsysinfo() for SI_KPROC_TAB failed.\n");
+       if(minix_getkproctab(proc, PROCS, 1) < 0) {
+               fprintf(stderr, "minix_getkproctab failed.\n");
                exit(1);
        }
+
        if (!preheated) {
                preheated = 1;
                memcpy(prev_proc, proc, sizeof(prev_proc));