X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=coreutils%2Fwhoami.c;h=c3b1140e6c940ddd40460eb7900cb5fcf90bf11d;hb=8b7a0d807a3ec8cfcbc4e4cb3067237b438bae14;hp=84b27fe58ec472f0b63f9f766fe77bf6b38e6243;hpb=bf181b9338152759fd56c8009e9a962a84808e7c;p=oweals%2Fbusybox.git

diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 84b27fe58..c3b1140e6 100644
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -20,23 +20,25 @@
  *
  */
 
-#include "internal.h"
+/* getopt not needed */
+
 #include <stdio.h>
-#include <pwd.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "busybox.h"
 
 extern int whoami_main(int argc, char **argv)
 {
-	char *user = xmalloc(9);
+	char user[9];
 	uid_t uid = geteuid();
 
 	if (argc > 1)
-		usage(whoami_usage);
+		show_usage();
 
 	my_getpwuid(user, uid);
-	if (user) {
+	if (*user) {
 		puts(user);
-		exit(TRUE);
+		return EXIT_SUCCESS;
 	}
-	errorMsg("cannot find username for UID %u\n", (unsigned) uid);
-	return(FALSE);
+	error_msg_and_die("cannot find username for UID %u", (unsigned) uid);
 }