ftpd: do not use nasty tricks for re-execing if we are on MMU machine.

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

diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 3185817b6bd4a3e14e7db26ec9efffb828626993..0dbcba9553ef1d16ca4a01247cc1a288ecc5c370 100644 (file)
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -9,18 +9,18 @@
 
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
-int whoami_main(int argc, char **argv);
-int whoami_main(int argc, char **argv)
+/* This is a NOFORK applet. Be very careful! */
+
+int whoami_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int whoami_main(int argc, char **argv UNUSED_PARAM)
 {
        if (argc > 1)
                bb_show_usage();
 
-       puts(bb_getpwuid(NULL, geteuid(), -1));
-       /* exits on error */
-       fflush_stdout_and_exit(EXIT_SUCCESS);
+       /* Will complain and die if username not found */
+       puts(xuid2uname(geteuid()));
+
+       return fflush(stdout);
 }