diff options
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/id.c | 10 | ||||
| -rw-r--r-- | coreutils/whoami.c | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/coreutils/id.c b/coreutils/id.c index 6ddb23666..33e06f427 100644 --- a/coreutils/id.c +++ b/coreutils/id.c @@ -36,12 +36,8 @@ enum { #endif }; -static int print_common(unsigned id, - char* FAST_FUNC bb_getXXXid(char *name, int bufsize, long uid), - const char *prefix) +static int print_common(unsigned id, const char *name, const char *prefix) { - const char *name = bb_getXXXid(NULL, 0, id); - if (prefix) { printf("%s", prefix); } @@ -65,12 +61,12 @@ static int print_common(unsigned id, static int print_group(gid_t id, const char *prefix) { - return print_common(id, bb_getgrgid, prefix); + return print_common(id, gid2group(id), prefix); } static int print_user(uid_t id, const char *prefix) { - return print_common(id, bb_getpwuid, prefix); + return print_common(id, uid2uname(id), prefix); } /* On error set *n < 0 and return >= 0 diff --git a/coreutils/whoami.c b/coreutils/whoami.c index 6756d4ba9..0dbcba955 100644 --- a/coreutils/whoami.c +++ b/coreutils/whoami.c @@ -20,7 +20,7 @@ int whoami_main(int argc, char **argv UNUSED_PARAM) bb_show_usage(); /* Will complain and die if username not found */ - puts(bb_getpwuid(NULL, -1, geteuid())); + puts(xuid2uname(geteuid())); return fflush(stdout); } |