more bugs fixed -- found doing regression testing

[oweals/busybox.git] / whoami.c

diff --git a/whoami.c b/whoami.c
index 7fd5d01b29dde2446e141de739895e69b1f062cd..38a2b30787f02c3a321306fcc2dd8b29320d9738 100644 (file)
--- a/whoami.c
+++ b/whoami.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini whoami implementation for busybox
  *
@@ -19,26 +20,22 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <pwd.h>
 
-static const char whoami_usage[] = "whoami\n\n"
-"Print the user name associated with the current effective user id.\n"
-"Same as id -un.\n";
+extern int whoami_main(int argc, char **argv)
+{
+       char user[9];
+       uid_t uid = geteuid();
 
-extern int whoami_main(int argc, char **argv) {
-       struct passwd *pw;
-       uid_t uid;
+       if (argc > 1)
+               usage(whoami_usage);
 
-       if (argc > 1) usage (whoami_usage);
-
-       uid = geteuid ();
-       pw = getpwuid (uid);
-       if (pw) {
-               puts (pw->pw_name);
-               exit (TRUE);
-       }
-       fprintf (stderr, "%s: cannot find username for UID %u\n", argv[0], (unsigned) uid);
-       exit (FALSE);
+       my_getpwuid(user, uid);
+       if (*user) {
+               puts(user);
+               return EXIT_SUCCESS;
+       }
+       error_msg_and_die("cannot find username for UID %u\n", (unsigned) uid);
 }