X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fwhoami.c;h=f93034d3a3b860c8b8863cfa17303ee9a490e937;hb=637d2266e1ea711f27ab0aec200a196b5eccbbca;hp=6a5dd2c04ef9b5bfe37ce5bd252b41ee80ef1cec;hpb=f57c944e09417edcbcd69f2b01b937cadef39db2;p=oweals%2Fbusybox.git

diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 6a5dd2c04..f93034d3a 100644
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -20,22 +20,25 @@
  *
  */
 
-#include "busybox.h"
+/* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
+
 #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);
-	uid_t uid = geteuid();
+	char user[9];
+	uid_t uid;
 
 	if (argc > 1)
-		usage(whoami_usage);
+		bb_show_usage();
 
-	my_getpwuid(user, uid);
-	if (user) {
+	uid = geteuid();
+	if (my_getpwuid(user, uid)) {
 		puts(user);
-		return EXIT_SUCCESS;
+		bb_fflush_stdout_and_exit(EXIT_SUCCESS);
 	}
-	error_msg_and_die("cannot find username for UID %u\n", (unsigned) uid);
+	bb_error_msg_and_die("cannot find username for UID %u", (unsigned) uid);
 }