diff options
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/tr.c | 6 | ||||
| -rw-r--r-- | coreutils/whoami.c | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/coreutils/tr.c b/coreutils/tr.c index 079c252..ebb6479 100644 --- a/coreutils/tr.c +++ b/coreutils/tr.c @@ -2,8 +2,10 @@ /* * Mini tr implementation for busybox * - * This version of tr is adapted from Minix tr - * Author: Michiel Huisjes + * Copyright (c) Michiel Huisjes + * + * This version of tr is adapted from Minix tr and was modified + * by Erik Andersen <andersee@debian.org> to be used in busybox. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/coreutils/whoami.c b/coreutils/whoami.c index 5c3fea1..f9d3f28 100644 --- a/coreutils/whoami.c +++ b/coreutils/whoami.c @@ -29,16 +29,15 @@ static const char whoami_usage[] = "whoami\n\n" extern int whoami_main(int argc, char **argv) { - struct passwd *pw; - uid_t uid; + char *user = xmalloc(9); + uid_t uid = geteuid(); if (argc > 1) usage(whoami_usage); - uid = geteuid(); - pw = getpwuid(uid); - if (pw) { - puts(pw->pw_name); + my_getpwuid(user, uid); + if (user) { + puts(user); exit(TRUE); } fprintf(stderr, "%s: cannot find username for UID %u\n", argv[0], |