v[hp]error_msg have 2-3 callsites only -> incorporate there.

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

diff --git a/libbb/login.c b/libbb/login.c
index 646995b0bcc27cd938c4db78284f51b4510de11e..308e1bfed613398aae4062869444a1852c6a16ed 100644 (file)
--- a/libbb/login.c
+++ b/libbb/login.c
@@ -10,17 +10,13 @@
  */
 
 #include <sys/param.h>  /* MAXHOSTNAMELEN */
-#include <stdio.h>
-#include <unistd.h>
-#include "libbb.h"
-
 #include <sys/utsname.h>
-#include <time.h>
+#include "libbb.h"
 
 #define LOGIN " login: "
 
-static const char fmtstr_d[] = "%A, %d %B %Y";
-static const char fmtstr_t[] = "%H:%M:%S";
+static const char fmtstr_d[] ALIGN1 = "%A, %d %B %Y";
+static const char fmtstr_t[] ALIGN1 = "%H:%M:%S";
 
 void print_login_issue(const char *issue_file, const char *tty)
 {
@@ -36,83 +32,70 @@ void print_login_issue(const char *issue_file, const char *tty)
 
        puts("\r");     /* start a new line */
 
-       if ((fd = fopen(issue_file, "r"))) {
-               while ((c = fgetc(fd)) != EOF) {
-                       outbuf = buf;
-                       buf[0] = c;
-                       if(c == '\n') {
-                               buf[1] = '\r';
-                               buf[2] = 0;
-                       } else {
-                               buf[1] = 0;
-                       }
-                       if (c == '\\' || c == '%') {
-                               c = fgetc(fd);
-                               switch (c) {
-                                       case 's':
-                                               outbuf = uts.sysname;
-                                               break;
-
-                                       case 'n':
-                                               outbuf = uts.nodename;
-                                               break;
-
-                                       case 'r':
-                                               outbuf = uts.release;
-                                               break;
-
-                                       case 'v':
-                                               outbuf = uts.version;
-                                               break;
-
-                                       case 'm':
-                                               outbuf = uts.machine;
-                                               break;
-
-                                       case 'D':
-                                       case 'o':
-                                               c = getdomainname(buf, sizeof(buf) - 1);
-                                               buf[c >= 0 ? c : 0] = '\0';
-                                               break;
-
-                                       case 'd':
-                                               strftime(buf, sizeof(buf), fmtstr_d, localtime(&t));
-                                               break;
-
-                                       case 't':
-                                               strftime(buf, sizeof(buf), fmtstr_t, localtime(&t));
-                                               break;
-
-                                       case 'h':
-                                               gethostname(buf, sizeof(buf) - 1);
-                                               buf[sizeof(buf) - 1] = '\0';
-                                               break;
-
-                                       case 'l':
-                                               outbuf = tty;
-                                               break;
-
-                                       default:
-                                               buf[0] = c;
-                               }
+       fd = fopen(issue_file, "r");
+       if (!fd)
+               return;
+       while ((c = fgetc(fd)) != EOF) {
+               outbuf = buf;
+               buf[0] = c;
+               buf[1] = '\0';
+               if (c == '\n') {
+                       buf[1] = '\r';
+                       buf[2] = '\0';
+               }
+               if (c == '\\' || c == '%') {
+                       c = fgetc(fd);
+                       switch (c) {
+                       case 's':
+                               outbuf = uts.sysname;
+                               break;
+                       case 'n':
+                               outbuf = uts.nodename;
+                               break;
+                       case 'r':
+                               outbuf = uts.release;
+                               break;
+                       case 'v':
+                               outbuf = uts.version;
+                               break;
+                       case 'm':
+                               outbuf = uts.machine;
+                               break;
+                       case 'D':
+                       case 'o':
+                               c = getdomainname(buf, sizeof(buf) - 1);
+                               buf[c >= 0 ? c : 0] = '\0';
+                               break;
+                       case 'd':
+                               strftime(buf, sizeof(buf), fmtstr_d, localtime(&t));
+                               break;
+                       case 't':
+                               strftime(buf, sizeof(buf), fmtstr_t, localtime(&t));
+                               break;
+                       case 'h':
+                               gethostname(buf, sizeof(buf) - 1);
+                               buf[sizeof(buf) - 1] = '\0';
+                               break;
+                       case 'l':
+                               outbuf = tty;
+                               break;
+                       default:
+                               buf[0] = c;
                        }
-                       fputs(outbuf, stdout);
                }
-
-               fclose(fd);
-
-               fflush(stdout);
+               fputs(outbuf, stdout);
        }
+       fclose(fd);
+       fflush(stdout);
 }
 
 void print_login_prompt(void)
 {
        char buf[MAXHOSTNAMELEN+1];
 
-       if(gethostname(buf, MAXHOSTNAMELEN) == 0)
+       if (gethostname(buf, MAXHOSTNAMELEN) == 0)
                fputs(buf, stdout);
 
        fputs(LOGIN, stdout);
        fflush(stdout);
 }
-