DeforaOS/utils
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

id: use getgroups() in "id -G"

Browse Source
This commit is contained in:
Pierre Pronchery 2020-12-08 19:36:18 +01:00
parent c1a55093ec
commit 398b5cce49
1 changed files with 19 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/id.c
View File

@ -59,6 +59,9 @@ static int _id_error(char const * message, int ret)
/* _id_G */ /* _id_G */
static int _id_G(char const * user, int flagn) static int _id_G(char const * user, int flagn)
{ {
gid_t * groups;
int n;
int i;
struct group * gr; struct group * gr;
struct passwd * pw; struct passwd * pw;
char * g; char * g;
@ -66,36 +69,17 @@ static int _id_G(char const * user, int flagn)
if(user == NULL) if(user == NULL)
{ {
if((pw = getpwuid(geteuid())) == NULL) if((groups = _id_getgroups(&n)) == NULL && n < 0)
return _id_error("getpwuid", 1); return 1;
if((gr = getgrgid(getegid())) == NULL) for(i = 0; i < n; i++)
return _id_error("getgrgid", 1); if(flagn != 0 && (gr = getgrgid(groups[i])) != NULL)
if(getegid() != getgid()) printf("%s%s", (i > 0) ? " " : "", gr->gr_name);
{
if(flagn == 0)
printf("%u %u", (unsigned)getegid(),
(unsigned)getgid());
else else
{ printf("%s%u", (i > 0) ? " " : "", groups[i]);
fputs(gr->gr_name, stdout);
if((gr = getgrgid(getgid())) == NULL)
{
putchar('\n'); putchar('\n');
return _id_error("getgrgid", 1); free(groups);
return 0;
} }
printf(" %s", gr->gr_name);
}
}
else
{
if(flagn == 0)
printf("%u", (unsigned)getgid());
else
fputs(gr->gr_name, stdout);
}
}
else
{
if((pw = getpwnam(user)) == NULL) if((pw = getpwnam(user)) == NULL)
return _id_error(user, 1); return _id_error(user, 1);
if((gr = getgrgid(pw->pw_gid)) == NULL) if((gr = getgrgid(pw->pw_gid)) == NULL)
@ -104,12 +88,10 @@ static int _id_G(char const * user, int flagn)
printf("%u", (unsigned)gr->gr_gid); printf("%u", (unsigned)gr->gr_gid);
else else
fputs(gr->gr_name, stdout); fputs(gr->gr_name, stdout);
}
if((g = strdup(gr->gr_name)) == NULL) if((g = strdup(gr->gr_name)) == NULL)
return _id_error(gr->gr_name, 1); return _id_error(gr->gr_name, 1);
setgrent(); setgrent();
for(gr = getgrent(); gr != NULL; gr = getgrent()) for(gr = getgrent(); gr != NULL; gr = getgrent())
{
for(p = gr->gr_mem; p != NULL && *p != NULL; p++) for(p = gr->gr_mem; p != NULL && *p != NULL; p++)
{ {
if(strcmp(pw->pw_name, *p) != 0 if(strcmp(pw->pw_name, *p) != 0
@ -120,7 +102,6 @@ static int _id_G(char const * user, int flagn)
else else
printf(" %s", gr->gr_name); printf(" %s", gr->gr_name);
} }
}
putchar('\n'); putchar('\n');
endgrent(); endgrent();
free(g); free(g);