Patchs from Jeff Garzik <jgarzik@mandrakesoft.com> to cleanup

[oweals/busybox.git] / coreutils / whoami.c

diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 5c3fea13f673923311261599d725906772600b5a..0bbb54b7b2abaf594d844e0ac7ff3043cf4fa339 100644 (file)
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -20,28 +20,23 @@
  *
  */
 
-#include "internal.h"
 #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";
+#include <stdlib.h>
+#include <unistd.h>
+#include "busybox.h"
 
 extern int whoami_main(int argc, char **argv)
 {
-       struct passwd *pw;
-       uid_t uid;
+       char user[9];
+       uid_t uid = geteuid();
 
        if (argc > 1)
-               usage(whoami_usage);
+               show_usage();
 
-       uid = geteuid();
-       pw = getpwuid(uid);
-       if (pw) {
-               puts(pw->pw_name);
-               exit(TRUE);
+       my_getpwuid(user, uid);
+       if (*user) {
+               puts(user);
+               return EXIT_SUCCESS;
        }
-       fprintf(stderr, "%s: cannot find username for UID %u\n", argv[0],
-                       (unsigned) uid);
-       exit(FALSE);
+       error_msg_and_die("cannot find username for UID %u", (unsigned) uid);
 }