Remove yet more kernel header dependancies.

[oweals/busybox.git] / whoami.c

diff --git a/whoami.c b/whoami.c
index 5c3fea13f673923311261599d725906772600b5a..950f52fb2e54feefe7aab388a63b14b901c9c6c3 100644 (file)
--- a/whoami.c
+++ b/whoami.c
@@ -24,24 +24,26 @@
 #include <stdio.h>
 #include <pwd.h>
 
-static const char whoami_usage[] = "whoami\n\n"
-       "Prints the user name associated with the current effective user id.\n";
+static const char whoami_usage[] = "whoami\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nPrints the user name associated with the current effective user id.\n"
+#endif
+       ;
 
 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],
                        (unsigned) uid);
-       exit(FALSE);
+       return(FALSE);
 }