+/* vi: set sw=4 ts=4: */
/*
* issue.c: issue printing code
*
* Copyright (C) 2003 Bastian Blank <waldi@tuxbox.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.
+ * Optimize and correcting OCRNL by Vladimir Oleynik <dzo@simtreas.ru>
*
- * 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.
- *
- * $Id: login.c,v 1.3 2003/05/13 13:28:25 bug1 Exp $
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
+#include <sys/param.h> /* MAXHOSTNAMELEN */
#include <stdio.h>
#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
#include <sys/utsname.h>
#include <time.h>
#define LOGIN " login: "
-static char fmtstr_d[] = { "%A, %d %B %Y" };
-static char fmtstr_t[] = { "%H:%M:%S" };
+static const char fmtstr_d[] = "%A, %d %B %Y";
+static const char fmtstr_t[] = "%H:%M:%S";
void print_login_issue(const char *issue_file, const char *tty)
{
FILE *fd;
int c;
- char buf[256];
+ char buf[256+1];
+ const char *outbuf;
time_t t;
struct utsname uts;
time(&t);
uname(&uts);
- puts(""); /* start a new line */
-
- if ((fd = fopen(issue_file, "r"))) {
- while ((c = fgetc(fd)) != EOF) {
- if (c == '\\' || c == '%') {
- c = fgetc(fd);
-
- switch (c) {
- case 's':
- fputs(uts.sysname, stdout);
- break;
-
- case 'n':
- fputs(uts.nodename, stdout);
- break;
-
- case 'r':
- fputs(uts.release, stdout);
- break;
-
- case 'v':
- fputs(uts.version, stdout);
- break;
-
- case 'm':
- fputs(uts.machine, stdout);
- break;
-
- case 'D':
- case 'o':
- getdomainname(buf, sizeof(buf));
- buf[sizeof(buf) - 1] = '\0';
- fputs(buf, stdout);
- break;
-
- case 'd':
- strftime(buf, sizeof(buf), fmtstr_d, localtime(&t));
- fputs(buf, stdout);
- break;
-
- case 't':
- strftime(buf, sizeof(buf), fmtstr_t, localtime(&t));
- fputs(buf, stdout);
- break;
-
- case 'h':
- gethostname(buf, sizeof(buf));
- fputs(buf, stdout);
- break;
-
- case 'l':
- printf("%s", tty);
- break;
-
- default:
- putchar(c);
- }
- } else
- putchar(c);
+ puts("\r"); /* start a new line */
+
+ 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';
}
-
- puts(""); /* start a new line */
- fflush(stdout);
-
- fclose(fd);
+ 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);
}
void print_login_prompt(void)
{
- char buf[MAXHOSTNAMELEN];
+ char buf[MAXHOSTNAMELEN+1];
- gethostname(buf, MAXHOSTNAMELEN);
- fputs(buf, stdout);
+ if (gethostname(buf, MAXHOSTNAMELEN) == 0)
+ fputs(buf, stdout);
fputs(LOGIN, stdout);
fflush(stdout);
}
-
projects / oweals / busybox.git / blobdiff