Disable any buffering to stdout

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

diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index d7f0a177c99769702c87668fac7fc7d6bc153cbb..f93034d3a3b860c8b8863cfa17303ee9a490e937 100644 (file)
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -20,21 +20,25 @@
  *
  */
 
-#include "busybox.h"
+/* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
+
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "busybox.h"
 
 extern int whoami_main(int argc, char **argv)
 {
        char user[9];
-       uid_t uid = geteuid();
+       uid_t uid;
 
        if (argc > 1)
-               usage(whoami_usage);
+               bb_show_usage();
 
-       my_getpwuid(user, uid);
-       if (*user) {
+       uid = geteuid();
+       if (my_getpwuid(user, uid)) {
                puts(user);
-               return EXIT_SUCCESS;
+               bb_fflush_stdout_and_exit(EXIT_SUCCESS);
        }
-       error_msg_and_die("cannot find username for UID %u\n", (unsigned) uid);
+       bb_error_msg_and_die("cannot find username for UID %u", (unsigned) uid);
 }