X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Flogname.c;h=ca5eb41cfa9b212f145c93b847317cf148b7bb39;hb=627814bdc3ef9b405a77686d73e7b53ebd767a07;hp=7c6153f64e2aa7846664e829945530e403647e45;hpb=7ab9c7ee52db8759d457819f5480378fa3aa97cc;p=oweals%2Fbusybox.git

diff --git a/coreutils/logname.c b/coreutils/logname.c
index 7c6153f64..ca5eb41cf 100644
--- a/coreutils/logname.c
+++ b/coreutils/logname.c
@@ -20,27 +20,36 @@
  *
  */
 
-#include "internal.h"
-#include <stdio.h>
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/logname.html */
 
-static const char logname_usage[] = "logname\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrint the name of the current user.\n"
-#endif
-	;
+/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
+ *
+ * SUSv3 specifies the string used is that returned from getlogin().
+ * The previous implementation used getpwuid() for geteuid(), which
+ * is _not_ the same.  Erik apparently made this change almost 3 years
+ * ago to avoid failing when no utmp was available.  However, the
+ * correct course of action wrt SUSv3 for a failing getlogin() is
+ * a diagnostic message and an error return.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "busybox.h"
 
 extern int logname_main(int argc, char **argv)
 {
-	char *user = xmalloc(9);
+	const char *p;
 
-	if (argc > 1)
-		usage(logname_usage);
+	if (argc > 1) {
+		bb_show_usage();
+	}
 
-	my_getpwuid(user, geteuid());
-	if (user) {
-		puts(user);
-		exit(TRUE);
+	if ((p = getlogin()) != NULL) {
+		puts(p);
+		bb_fflush_stdout_and_exit(EXIT_SUCCESS);
 	}
-	fprintf(stderr, "no login name\n");
-	exit(FALSE);
+
+	bb_perror_msg_and_die("getlogin");
 }