X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=whoami.c;h=c3b1140e6c940ddd40460eb7900cb5fcf90bf11d;hb=044228d5ecb9b79397f9fc915d046cf4538281e2;hp=f3c21b3f5a89886b49fee8ca2d219afa2fe81774;hpb=3570a34de46b1f7dedd16999bb1687e2d6b55d40;p=oweals%2Fbusybox.git

diff --git a/whoami.c b/whoami.c
index f3c21b3f5..c3b1140e6 100644
--- a/whoami.c
+++ b/whoami.c
@@ -20,23 +20,25 @@
  *
  */
 
-#include "busybox.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);
 }