From b974f7d8920a8a29e450cc824a6603f99fbc8671 Mon Sep 17 00:00:00 2001 From: Andrzej Bialecki Date: Sat, 11 Nov 2000 16:12:39 +0000 Subject: [PATCH] Fix bitrot. --- release/picobsd/tinyware/sps/README | 6 --- release/picobsd/tinyware/sps/sps.c | 66 +++++++++++++++++++---------- 2 files changed, 44 insertions(+), 28 deletions(-) diff --git a/release/picobsd/tinyware/sps/README b/release/picobsd/tinyware/sps/README index cf7b7212d2ac..2357113bf2ca 100644 --- a/release/picobsd/tinyware/sps/README +++ b/release/picobsd/tinyware/sps/README @@ -1,5 +1,3 @@ -1998.07.17 - This is a small 'ps' replacement, which uses information available via sysctl(3) interface (contrary to the 'aps', which requires you to mount procfs(5) to be able to get exactly the same info, so I think that 'sps' @@ -8,10 +6,6 @@ is superior solution). When I have some time, I'll add usual switches and other functions that normal 'ps' has... -The most serious limitation of 'sps' is that it's unable to retrieve the whole -command line. - - $FreeBSD$ diff --git a/release/picobsd/tinyware/sps/sps.c b/release/picobsd/tinyware/sps/sps.c index 1e490f8c1fe4..938cde30dbd3 100644 --- a/release/picobsd/tinyware/sps/sps.c +++ b/release/picobsd/tinyware/sps/sps.c @@ -39,14 +39,17 @@ #include #include -char p_stat[]="?iRSTZ"; +char p_stat[]="?iRSTZWM"; int main(int argc, char *argv[]) { - int mib[3],i=0,num,len; - struct kinfo_proc kp,*t,*u; - char buf[20],vty[5],pst[5]; + int mib[4],i=0, num, len, j, plen; + int sz = sizeof(struct proc) + sizeof(struct eproc); + struct proc *p; + struct eproc *ep; + char buf[MAXPATHLEN],vty[5],pst[5], wmesg[10]; + char *t; int ma,mi; mib[0]=CTL_KERN; @@ -56,18 +59,38 @@ main(int argc, char *argv[]) perror("sysctl sizing"); exit(1); } - t=(struct kinfo_proc *)malloc(len); + t=(char *)malloc(len); if(sysctl(mib,3,t,&len,NULL,0)) { perror("sysctl info"); exit(1); } - num=len / sizeof(struct kinfo_proc); + mib[2]=KERN_PROC_ARGS; + num = len / sz; i=0; - printf("USERNAME PID PPID PRI NICE TTY STAT WCHAN COMMAND\n"); - while(ikp_eproc.e_tdev); - mi=minor(u->kp_eproc.e_tdev); + printf("USERNAME PID PPID PRI NICE TTY STAT WCHAN COMMAND\n"); + while(i < num) { + p=(struct proc *)(t + (num - i - 1) * sz); + ep=(struct eproc *)(t + (num - i - 1) * sz + sizeof(struct proc)); + mib[3]=p->p_pid; + plen = MAXPATHLEN; + if(sysctl(mib,4,buf,&plen,NULL,0)) { + perror("sysctl info"); + exit(1); + } + if(plen == 0) { + sprintf(buf, "(%s)", p->p_comm); + } else { + for(j=0; j < plen-1; j++) { + if(buf[j] == '\0') buf[j] = ' '; + } + } + if(strcmp(ep->e_wmesg, "") == 0) { + sprintf(wmesg, "-"); + } else { + strcpy(wmesg, ep->e_wmesg); + } + ma=major(ep->e_tdev); + mi=minor(ep->e_tdev); switch(ma) { case 255: strcpy(vty,"??"); @@ -85,20 +108,19 @@ main(int argc, char *argv[]) sprintf(vty,"p%d",mi); break; } - sprintf(pst,"%c",p_stat[u->kp_proc.p_stat]); - printf("%8s%5d%5d %3d %4d %3s %-4s %-7s (%s)\n", - u->kp_eproc.e_login, - u->kp_proc.p_pid, - u->kp_eproc.e_ppid, - u->kp_proc.p_priority, - u->kp_proc.p_nice, + sprintf(pst,"%c",p_stat[p->p_stat]); + printf("%8s %5u %5u %3d %4d %3s %-4s %-7s %s\n", + ep->e_login, + p->p_pid, + ep->e_ppid, + p->p_priority - 22, + p->p_nice, vty, pst, - u->kp_eproc.e_wmesg, - u->kp_proc.p_comm); + wmesg, + buf); i++; } - free(t); + free((void *)t); exit(0); - }