traceroute: fix help text to not show -6 when traceroute6 is off

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

diff --git a/libbb/login.c b/libbb/login.c
index 346ff13eb18dd8116d2254e19c743b0f1dac5611..740c588f36f3a927419e9567b0eb0a4c2d0af99c 100644 (file)
--- a/libbb/login.c
+++ b/libbb/login.c
@@ -9,9 +9,9 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#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: "
 
@@ -20,7 +20,7 @@ static const char fmtstr_t[] ALIGN1 = "%H:%M:%S";
 
 void FAST_FUNC print_login_issue(const char *issue_file, const char *tty)
 {
-       FILE *fd;
+       FILE *fp;
        int c;
        char buf[256+1];
        const char *outbuf;
@@ -32,10 +32,10 @@ void FAST_FUNC print_login_issue(const char *issue_file, const char *tty)
 
        puts("\r");     /* start a new line */
 
-       fd = fopen(issue_file, "r");
-       if (!fd)
+       fp = fopen_for_read(issue_file);
+       if (!fp)
                return;
-       while ((c = fgetc(fd)) != EOF) {
+       while ((c = fgetc(fp)) != EOF) {
                outbuf = buf;
                buf[0] = c;
                buf[1] = '\0';
@@ -44,7 +44,7 @@ void FAST_FUNC print_login_issue(const char *issue_file, const char *tty)
                        buf[2] = '\0';
                }
                if (c == '\\' || c == '%') {
-                       c = fgetc(fd);
+                       c = fgetc(fp);
                        switch (c) {
                        case 's':
                                outbuf = uts.sysname;
@@ -62,11 +62,13 @@ void FAST_FUNC print_login_issue(const char *issue_file, const char *tty)
                        case 'm':
                                outbuf = uts.machine;
                                break;
+/* The field domainname of struct utsname is Linux specific. */
+#if defined(__linux__)
                        case 'D':
                        case 'o':
-                               c = getdomainname(buf, sizeof(buf) - 1);
-                               buf[c >= 0 ? c : 0] = '\0';
+                               outbuf = uts.domainname;
                                break;
+#endif
                        case 'd':
                                strftime(buf, sizeof(buf), fmtstr_d, localtime(&t));
                                break;
@@ -82,8 +84,8 @@ void FAST_FUNC print_login_issue(const char *issue_file, const char *tty)
                }
                fputs(outbuf, stdout);
        }
-       fclose(fd);
-       fflush(stdout);
+       fclose(fp);
+       fflush_all();
 }
 
 void FAST_FUNC print_login_prompt(void)
@@ -92,7 +94,7 @@ void FAST_FUNC print_login_prompt(void)
 
        fputs(hostname, stdout);
        fputs(LOGIN, stdout);
-       fflush(stdout);
+       fflush_all();
        free(hostname);
 }