Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the group list format consistent between id' and id userid'. Also make

Browse Source 
it look like what Solaris and Linux use (comma but no space between items).
This commit is contained in:
mycroft 1999-08-17 17:37:32 +00:00
parent a47874ac23
commit b6fad0e324
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usr.bin/id/id.c
View File

@ -41,7 +41,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
#if 0
static char sccsid[] = "@(#)id.c 8.3 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: id.c,v 1.14 1998/12/19 16:55:21 christos Exp $");
__RCSID("$NetBSD: id.c,v 1.15 1999/08/17 17:37:32 mycroft Exp $");
#endif
#endif /* not lint */
@ -239,8 +239,8 @@ current()
}
if ((ngroups = getgroups(maxgroups, groups)) != NULL) {
for (fmt = " groups=%u", lastid = -1, cnt = 0; cnt < ngroups;
fmt = ", %u", lastid = id) {
id = groups[cnt++];
fmt = ",%u", lastid = id, cnt++) {
id = groups[cnt];
if (lastid == id)
continue;
(void)printf(fmt, id);
@ -266,15 +266,14 @@ user(pw)
(void)printf("(%s)", gr->gr_name);
ngroups = maxgroups + 1;
(void) getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups);
fmt = " groups=%u";
for (lastid = -1, cnt = 0; cnt < ngroups; ++cnt) {
if (lastid == (id = groups[cnt]))
for (fmt = " groups=%u", lastid = -1, cnt = 0; cnt < ngroups;
fmt=",%u", lastid = id, cnt++) {
id = groups[cnt];
if (lastid == id)
continue;
(void)printf(fmt, id);
fmt = " %u";
if ((gr = getgrgid(id)) != NULL)
(void)printf("(%s)", gr->gr_name);
lastid = id;
}
(void)printf("\n");
}