summaryrefslogtreecommitdiffhomepage
path: root/loginutils
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-11-07 01:12:16 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-11-07 01:12:16 +0000
commit694b514148681193e1710daa073f5bc1263b0d95 (patch)
tree172f1891c742473657b04f72976059a56315e254 /loginutils
parent239d06bd4710e8463c6cc7e5411965066a6d134e (diff)
login: fix /etc/nologin support
build system: fix config warnings ("Overlong line") function old new delta login_main 1735 1774 +39 __libc_tcdrain - 23 +23 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 1/0 up/down: 62/0) Total: 62 bytes
Diffstat (limited to 'loginutils')
-rw-r--r--loginutils/login.c23
1 files changed, 15 insertions, 8 deletions
diff --git a/loginutils/login.c b/loginutils/login.c
index 8732b99f1..861382f12 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -118,18 +118,25 @@ static void die_if_nologin(void)
{
FILE *fp;
int c;
+ int empty = 1;
- if (access("/etc/nologin", F_OK))
+ fp = fopen_for_read("/etc/nologin");
+ if (!fp) /* assuming it does not exist */
return;
- fp = fopen_for_read("/etc/nologin");
- if (fp) {
- while ((c = getc(fp)) != EOF)
- bb_putchar((c=='\n') ? '\r' : c);
- fflush(stdout);
- fclose(fp);
- } else
+ while ((c = getc(fp)) != EOF) {
+ if (c == '\n')
+ bb_putchar('\r');
+ bb_putchar(c);
+ empty = 0;
+ }
+ if (empty)
puts("\r\nSystem closed for routine maintenance\r");
+
+ fclose(fp);
+ fflush(NULL);
+ /* Users say that they do need this prior to exit: */
+ tcdrain(STDOUT_FILENO);
exit(EXIT_FAILURE);
}
#else