Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check getchar() result for EOF.

Browse Source 
Call cleanup(SIGHUP) if we get local EOF, as if we've got SIGHUP.
While here, use EOF constant instead of literal -1 in an existing
check.

PR bin/53996
This commit is contained in:
uwe 2019-02-22 22:25:22 +00:00
parent 60282a8efb
commit c07928f07f
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
usr.bin/tip/tip.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tip.c,v 1.60 2019/02/06 14:08:50 rin Exp $ */ /* $NetBSD: tip.c,v 1.61 2019/02/22 22:25:22 uwe Exp $ */
/* /*
* Copyright (c) 1983, 1993 * Copyright (c) 1983, 1993
@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\
#if 0 #if 0
static char sccsid[] = "@(#)tip.c 8.1 (Berkeley) 6/6/93"; static char sccsid[] = "@(#)tip.c 8.1 (Berkeley) 6/6/93";
#endif #endif
__RCSID("$NetBSD: tip.c,v 1.60 2019/02/06 14:08:50 rin Exp $"); __RCSID("$NetBSD: tip.c,v 1.61 2019/02/22 22:25:22 uwe Exp $");
#endif /* not lint */ #endif /* not lint */
/* /*
@ -304,7 +304,7 @@ prompt(const char *s, char *volatile p, size_t l)
unraw(); unraw();
(void)printf("%s", s); (void)printf("%s", s);
if (setjmp(promptbuf) == 0) if (setjmp(promptbuf) == 0)
while ((c = getchar()) != -1 && (*p = c) != '\n' && while ((c = getchar()) != EOF && (*p = c) != '\n' &&
b + l > p) b + l > p)
p++; p++;
*p = '\0'; *p = '\0';
@ -329,6 +329,22 @@ intprompt(int dummy __unused)
longjmp(promptbuf, 1); longjmp(promptbuf, 1);
} }
/*
* getchar() wrapper that checks for EOF on the local end.
*/
static char
xgetchar(void)
{
int c = getchar();
if (__predict_false(c == EOF)) {
cleanup(SIGHUP);
/* NOTREACHED */
}
return (char)c & STRIP_PAR;
}
/* /*
* ****TIPIN TIPIN**** * ****TIPIN TIPIN****
*/ */
@ -350,7 +366,7 @@ tipin(void)
} }
for (;;) { for (;;) {
gch = getchar()&STRIP_PAR; gch = xgetchar();
if ((gch == character(value(ESCAPE))) && bol) { if ((gch == character(value(ESCAPE))) && bol) {
if (!(gch = escape())) if (!(gch = escape()))
continue; continue;
@ -365,7 +381,7 @@ tipin(void)
(void)printf("%s\n", gch == '\r' ? "\r" : ""); (void)printf("%s\n", gch == '\r' ? "\r" : "");
continue; continue;
} else if (!cumode && gch && gch == character(value(FORCE))) } else if (!cumode && gch && gch == character(value(FORCE)))
gch = getchar()&STRIP_PAR; gch = xgetchar();
bol = any(gch, value(EOL)); bol = any(gch, value(EOL));
if (boolean(value(RAISE)) && islower((unsigned char)gch)) if (boolean(value(RAISE)) && islower((unsigned char)gch))
gch = toupper((unsigned char)gch); gch = toupper((unsigned char)gch);
@ -386,7 +402,7 @@ escape(void)
esctable_t *p; esctable_t *p;
char c = character(value(ESCAPE)); char c = character(value(ESCAPE));
gch = (getchar()&STRIP_PAR); gch = xgetchar();
for (p = etable; p->e_char; p++) for (p = etable; p->e_char; p++)
if (p->e_char == gch) { if (p->e_char == gch) {
if ((p->e_flags&PRIV) && uid) if ((p->e_flags&PRIV) && uid)