tftp: optional tftp-hpa compat

[oweals/busybox.git] / coreutils / logname.c

diff --git a/coreutils/logname.c b/coreutils/logname.c
index aba6ce3c6162500e24a3f16c8abc33b0ff671b72..31ce61f0c2fbbb9f8fa42483bbe0a1317c98c52d 100644 (file)
--- a/coreutils/logname.c
+++ b/coreutils/logname.c
@@ -4,12 +4,8 @@
  *
  * Copyright (C) 2000  Edward Betts <edward@debian.org>.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
-/* 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().
@@ -19,24 +15,45 @@
  * correct course of action wrt SUSv3 for a failing getlogin() is
  * a diagnostic message and an error return.
  */
+//config:config LOGNAME
+//config:      bool "logname (1.1 kb)"
+//config:      default y
+//config:      help
+//config:      logname is used to print the current user's login name.
+
+//applet:IF_LOGNAME(APPLET_NOFORK(logname, logname, BB_DIR_USR_BIN, BB_SUID_DROP, logname))
+
+//kbuild:lib-$(CONFIG_LOGNAME) += logname.o
+
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/logname.html */
+
+//usage:#define logname_trivial_usage
+//usage:       ""
+//usage:#define logname_full_usage "\n\n"
+//usage:       "Print the name of the current user"
+//usage:
+//usage:#define logname_example_usage
+//usage:       "$ logname\n"
+//usage:       "root\n"
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
-int logname_main(int argc, char ATTRIBUTE_UNUSED **argv);
-int logname_main(int argc, char ATTRIBUTE_UNUSED **argv)
+int logname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int logname_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
-       char buf[128];
+       char buf[64];
 
-       if (argc > 1) {
+       if (argv[1]) {
                bb_show_usage();
        }
 
        /* Using _r function - avoid pulling in static buffer from libc */
        if (getlogin_r(buf, sizeof(buf)) == 0) {
                puts(buf);
-               return fflush(stdout);
+               return fflush_all();
        }
 
        bb_perror_msg_and_die("getlogin");