Disable any buffering to stdout

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

diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 3677c2fbcb0aed8e97da8c52fcbf83508e995713..f93034d3a3b860c8b8863cfa17303ee9a490e937 100644 (file)
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -20,30 +20,25 @@
  *
  */
 
-#include "internal.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"
+/* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-       "Same as id -un.\n";
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "busybox.h"
 
 extern int whoami_main(int argc, char **argv)
 {
-       struct passwd *pw;
+       char user[9];
        uid_t uid;
 
        if (argc > 1)
-               usage(whoami_usage);
+               bb_show_usage();
 
        uid = geteuid();
-       pw = getpwuid(uid);
-       if (pw) {
-               puts(pw->pw_name);
-               exit(TRUE);
+       if (my_getpwuid(user, uid)) {
+               puts(user);
+               bb_fflush_stdout_and_exit(EXIT_SUCCESS);
        }
-       fprintf(stderr, "%s: cannot find username for UID %u\n", argv[0],
-                       (unsigned) uid);
-       exit(FALSE);
+       bb_error_msg_and_die("cannot find username for UID %u", (unsigned) uid);
 }