tar: support -T - and -X -

[oweals/busybox.git] / libbb / login.c

diff --git a/libbb/login.c b/libbb/login.c
index 98e641cceeef106d1acaa24136ac6ef206fb1df8..8a82c6add71041d8df959439053a0a6a621d6e31 100644 (file)
--- a/libbb/login.c
+++ b/libbb/login.c
@@ -6,12 +6,12 @@
  *
  * Optimize and correcting OCRNL by Vladimir Oleynik <dzo@simtreas.ru>
  *
- * 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.
  */
 
-#include <sys/param.h>  /* MAXHOSTNAMELEN */
-#include <sys/utsname.h>
 #include "libbb.h"
+/* After libbb.h, since it needs sys/types.h on some systems */
+#include <sys/utsname.h>
 
 #define LOGIN " login: "
 
@@ -30,7 +30,7 @@ void FAST_FUNC print_login_issue(const char *issue_file, const char *tty)
        time(&t);
        uname(&uts);
 
-       puts("\r");     /* start a new line */
+       puts("\r");  /* start a new line */
 
        fp = fopen_for_read(issue_file);
        if (!fp)
@@ -62,7 +62,8 @@ void FAST_FUNC print_login_issue(const char *issue_file, const char *tty)
                        case 'm':
                                outbuf = uts.machine;
                                break;
-#ifndef HAVE_NO_UTSNAME_DOMAINNAME
+/* The field domainname of struct utsname is Linux specific. */
+#if defined(__linux__)
                        case 'D':
                        case 'o':
                                outbuf = uts.domainname;
@@ -84,7 +85,7 @@ void FAST_FUNC print_login_issue(const char *issue_file, const char *tty)
                fputs(outbuf, stdout);
        }
        fclose(fp);
-       fflush(stdout);
+       fflush_all();
 }
 
 void FAST_FUNC print_login_prompt(void)
@@ -93,7 +94,7 @@ void FAST_FUNC print_login_prompt(void)
 
        fputs(hostname, stdout);
        fputs(LOGIN, stdout);
-       fflush(stdout);
+       fflush_all();
        free(hostname);
 }