summaryrefslogtreecommitdiffstats
path: root/usr.sbin/cron/crontab.c
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>2004-11-04 18:44:59 +0000
committermillert <millert@openbsd.org>2004-11-04 18:44:59 +0000
commiteafde64aab2e8a7c4d4b17afd0b827822e2b3e8f (patch)
tree4434a8f89a78355ccdeb2b8c20d53e247ae28ea1 /usr.sbin/cron/crontab.c
parentfix entries for Sao Paulo and Porto Alegre, and add one for Curitiba. (diff)
downloadwireguard-openbsd-eafde64aab2e8a7c4d4b17afd0b827822e2b3e8f.tar.xz
wireguard-openbsd-eafde64aab2e8a7c4d4b17afd0b827822e2b3e8f.zip
Treat EOF at prompt the same as 'n' instead of looping forever.
Noticed by mepch@. OK pedro@ and deraadt@
Diffstat (limited to 'usr.sbin/cron/crontab.c')
-rw-r--r--usr.sbin/cron/crontab.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/usr.sbin/cron/crontab.c b/usr.sbin/cron/crontab.c
index 1d68908804e..cc44af45d25 100644
--- a/usr.sbin/cron/crontab.c
+++ b/usr.sbin/cron/crontab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crontab.c,v 1.46 2004/09/16 18:34:05 deraadt Exp $ */
+/* $OpenBSD: crontab.c,v 1.47 2004/11/04 18:44:59 millert Exp $ */
/* Copyright 1988,1990,1993,1994 by Paul Vixie
* All rights reserved
@@ -22,7 +22,7 @@
*/
#if !defined(lint) && !defined(LINT)
-static char const rcsid[] = "$OpenBSD: crontab.c,v 1.46 2004/09/16 18:34:05 deraadt Exp $";
+static char const rcsid[] = "$OpenBSD: crontab.c,v 1.47 2004/11/04 18:44:59 millert Exp $";
#endif
/* crontab - install and manage per-user crontab files
@@ -461,7 +461,10 @@ edit_cmd(void) {
printf("Do you want to retry the same edit? ");
fflush(stdout);
q[0] = '\0';
- (void) fgets(q, sizeof q, stdin);
+ if (fgets(q, sizeof q, stdin) == NULL) {
+ putchar('\n');
+ goto abandon;
+ }
switch (q[0]) {
case 'y':
case 'Y':
@@ -508,8 +511,8 @@ replace_cmd(void) {
fprintf(stderr, "%s: Cannot allocate memory.\n", ProgramName);
return (-2);
}
- if (snprintf(TempFilename, sizeof TempFilename, "%s/tmp.XXXXXXXXX", SPOOL_DIR) >=
- sizeof(TempFilename)) {
+ if (snprintf(TempFilename, sizeof TempFilename, "%s/tmp.XXXXXXXXX",
+ SPOOL_DIR) >= sizeof(TempFilename)) {
TempFilename[0] = '\0';
fprintf(stderr, "path too long\n");
return (-2);