d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support the SUSv3 `rgroup' format.

Browse Source 
Clean up some local style bogons.
This commit is contained in:
jmallett 2002-06-06 20:42:16 +00:00
parent bfb17f2ab2
commit b9515c4b9c
4 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/ps/extern.h
View File

@ -66,8 +66,10 @@ void pmem(KINFO *, VARENT *);
void pri(KINFO *, VARENT *);
void printheader(void);
void priorityr(KINFO *, VARENT *);
void rgroupname(KINFO *, VARENT *);
void runame(KINFO *, VARENT *);
void rvar(KINFO *, VARENT *);
int s_rgroupname(KINFO *);
int s_runame(KINFO *);
int s_uname(KINFO *);
void showkey(void);

2
bin/ps/keyword.c
View File

@ -156,6 +156,8 @@ static VAR var[] = {
0},
{"rgid", "RGID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_rgid),
UINT, UIDFMT, 0},
{"rgroup", "RGROUP", NULL, LJUST|DSIZ, rgroupname, s_rgroupname,
USERLEN, 0, CHAR, NULL, 0},
{"rss", "RSS", NULL, 0, kvar, NULL, 4, KOFF(ki_rssize), UINT, "d",
0},
{"rtprio", "RTPRIO", NULL, 0, priorityr, NULL, 7, KOFF(ki_pri), CHAR,

23
bin/ps/print.c
View File

@ -280,8 +280,7 @@ uname(KINFO *k, VARENT *ve)
VAR *v;
v = ve->var;
(void)printf("%-*s",
(int)v->width, user_from_uid(k->ki_p->ki_uid, 0));
(void)printf("%-*s", v->width, user_from_uid(k->ki_p->ki_uid, 0));
}
int
@ -290,14 +289,28 @@ s_uname(KINFO *k)
return (strlen(user_from_uid(k->ki_p->ki_uid, 0)));
}
void
rgroupname(KINFO *k, VARENT *ve)
{
VAR *v;
v = ve->var;
(void)printf("%-*s", v->width, group_from_gid(k->ki_p->ki_rgid, 0));
}
int
s_rgroupname(KINFO *k)
{
return (strlen(group_from_gid(k->ki_p->ki_rgid, 0)));
}
void
runame(KINFO *k, VARENT *ve)
{
VAR *v;
v = ve->var;
(void)printf("%-*s",
(int)v->width, user_from_uid(k->ki_p->ki_ruid, 0));
(void)printf("%-*s", v->width, user_from_uid(k->ki_p->ki_ruid, 0));
}
int
@ -718,5 +731,5 @@ lattr(KINFO *k, VARENT *ve)
VAR *v;
v = ve->var;
(void)printf("%-*d", (int)v->width, get_lattr(k->ki_p->ki_pid));
(void)printf("%-*d", v->width, get_lattr(k->ki_p->ki_pid));
}

2
bin/ps/ps.1
View File

@ -442,6 +442,8 @@ core residency time (in seconds; 127 = infinity)
.It rgid
real group
.Tn ID
.It rgroup
group name (from rgid)
.It rlink
reverse link on run queue, or 0
.It rss