lineedit: do not hang on error, but return error indicator.

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

diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 7fd5d01b29dde2446e141de739895e69b1f062cd..78d20db1409e27ec861be2ccdf0299d73cf27fed 100644 (file)
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -1,44 +1,26 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini whoami implementation for busybox
  *
  * 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 source tree.
  */
 
-#include "internal.h"
-#include <stdio.h>
-#include <pwd.h>
+/* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
+
+#include "libbb.h"
 
-static const char whoami_usage[] = "whoami\n\n"
-"Print the user name associated with the current effective user id.\n"
-"Same as id -un.\n";
+/* This is a NOFORK applet. Be very careful! */
 
-extern int whoami_main(int argc, char **argv) {
-       struct passwd *pw;
-       uid_t uid;
+int whoami_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int whoami_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
+{
+       if (argv[1])
+               bb_show_usage();
 
-       if (argc > 1) usage (whoami_usage);
+       /* Will complain and die if username not found */
+       puts(xuid2uname(geteuid()));
 
-       uid = geteuid ();
-       pw = getpwuid (uid);
-       if (pw) {
-               puts (pw->pw_name);
-               exit (TRUE);
-       }
-       fprintf (stderr, "%s: cannot find username for UID %u\n", argv[0], (unsigned) uid);
-       exit (FALSE);
+       return fflush_all();
 }