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 e2a03b1e91c5748afde4a969ae8446a3566f9245..0dbcba9553ef1d16ca4a01247cc1a288ecc5c370 100644 (file)
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -4,41 +4,23 @@
  *
  * Copyright (C) 2000  Edward Betts <edward@debian.org>.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
-extern int whoami_main(int argc, char **argv)
-{
-       char user[9];
-       uid_t uid;
+/* 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();
 
-       uid = geteuid();
-       if (my_getpwuid(user, uid, sizeof(user))) {
-               puts(user);
-               bb_fflush_stdout_and_exit(EXIT_SUCCESS);
-       }
-       bb_error_msg_and_die("cannot find username for UID %u", (unsigned) uid);
+       /* Will complain and die if username not found */
+       puts(xuid2uname(geteuid()));
+
+       return fflush(stdout);
 }