mkdir,rmdir: accept and ignore -v, --verbose

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

diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 71ef3537d036442619c3178b7349eb2a3cea9f12..30b17cab358910fca9db7a3146c1d32a27e87a5e 100644 (file)
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -4,35 +4,28 @@
  *
  * 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.
  */
 
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "busybox.h"
+//usage:#define whoami_trivial_usage
+//usage:       ""
+//usage:#define whoami_full_usage "\n\n"
+//usage:       "Print the user name associated with the current effective user id"
 
-int whoami_main(int argc, char **argv)
+#include "libbb.h"
+
+/* This is a NOFORK applet. Be very careful! */
+
+int whoami_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int whoami_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
-       if (argc > 1)
+       if (argv[1])
                bb_show_usage();
 
-       puts(bb_getpwuid(NULL, geteuid(), -1));
-       /* exits on error */
-       bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+       /* Will complain and die if username not found */
+       puts(xuid2uname(geteuid()));
+
+       return fflush_all();
 }