Support the SUSv3 `rgroup' format.

Clean up some local style bogons.

4 files changed, 24 insertions, 5 deletions

diff --git a/bin/ps/extern.h b/bin/ps/extern.h
index 2ea5724..beb5d62 100644
--- a/bin/ps/extern.h
+++ b/bin/ps/extern.h
@@ -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);
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index b54cb43..79ed4dc 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -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,
diff --git a/bin/ps/print.c b/bin/ps/print.c
index e3c3a3e..e949206 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -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
@@ -291,13 +290,27 @@ s_uname(KINFO *k)
 }
 
 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));
 }
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 80f541d..ba767f7 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -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