- add a colorful "valid HTML 4.01 Transitional" button to be able to check the refere...

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

diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 6a5dd2c04ef9b5bfe37ce5bd252b41ee80ef1cec..71ef3537d036442619c3178b7349eb2a3cea9f12 100644 (file)
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -20,22 +20,19 @@
  *
  */
 
-#include "busybox.h"
+/* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
+
 #include <stdio.h>
-#include <pwd.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "busybox.h"
 
-extern int whoami_main(int argc, char **argv)
+int whoami_main(int argc, char **argv)
 {
-       char *user = xmalloc(9);
-       uid_t uid = geteuid();
-
        if (argc > 1)
-               usage(whoami_usage);
+               bb_show_usage();
 
-       my_getpwuid(user, uid);
-       if (user) {
-               puts(user);
-               return EXIT_SUCCESS;
-       }
-       error_msg_and_die("cannot find username for UID %u\n", (unsigned) uid);
+       puts(bb_getpwuid(NULL, geteuid(), -1));
+       /* exits on error */
+       bb_fflush_stdout_and_exit(EXIT_SUCCESS);
 }