From 347fac6ffae1196b664691771bd60ec1d87ad614 Mon Sep 17 00:00:00 2001 From: Jakob Kaivo Date: Fri, 1 Nov 2019 10:26:58 -0400 Subject: rename id_printgids() to print_groups() --- id.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/id.c b/id.c index d02ab4e..01ff84f 100644 --- a/id.c +++ b/id.c @@ -72,7 +72,7 @@ static void print_id(const char *prefix, enum type type, id_t id, int mode) } } -static void id_printgids(uid_t uid, int mode) +static void print_groups(uid_t uid, int mode) { struct passwd *pwd = getpwuid(uid); if (pwd == NULL) { @@ -133,9 +133,7 @@ int main(int argc, char *argv[]) return 1; } - if (optind >= argc) { - /* TODO: handle -u */ - } else { + if (optind == argc - 1) { struct passwd *pwd = getpwnam(argv[optind]); if (pwd == NULL) { fprintf(stderr, "id: user '%s' not found\n", @@ -148,7 +146,7 @@ int main(int argc, char *argv[]) switch (mode) { case 'G': - id_printgids(uid, names ? NAMES : NUMS); + print_groups(uid, names ? NAMES : NUMS); break; case 'g': @@ -171,7 +169,7 @@ int main(int argc, char *argv[]) print_id(" egid=", GROUP, getegid(), 0); } - id_printgids(uid, FULL); + print_groups(uid, FULL); } printf("\n"); -- cgit v1.2.1