X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Flogname.c;h=2e628bc146896197071c4cb3b7746a33fd6a7f7e;hb=b6adbf1be29841501cc49917249e85f273e1df7c;hp=edec016e67a4e9077e2a1749066f632614bba311;hpb=ed3ef50c233ffb1b50ea0e7382a8e60b86491009;p=oweals%2Fbusybox.git

diff --git a/coreutils/logname.c b/coreutils/logname.c
index edec016e6..2e628bc14 100644
--- a/coreutils/logname.c
+++ b/coreutils/logname.c
@@ -4,38 +4,40 @@
  *
  * 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 tarball for details.
+ */
+
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/logname.html */
+
+/* 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 "busybox.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include "libbb.h"
+
+/* This is a NOFORK applet. Be very careful! */
 
-extern int logname_main(int argc, char **argv)
+int logname_main(int argc, char ATTRIBUTE_UNUSED **argv);
+int logname_main(int argc, char ATTRIBUTE_UNUSED **argv)
 {
-	char user[9];
+	char buf[128];
 
-	if (argc > 1)
-		usage(logname_usage);
+	if (argc > 1) {
+		bb_show_usage();
+	}
 
-	my_getpwuid(user, geteuid());
-	if (*user) {
-		puts(user);
-		return EXIT_SUCCESS;
+	/* Using _r function - avoid pulling in static buffer from libc */
+	if (getlogin_r(buf, sizeof(buf)) == 0) {
+		puts(buf);
+		return fflush(stdout);
 	}
-	error_msg_and_die("no login name\n");
+
+	bb_perror_msg_and_die("getlogin");
 }