diff options
| author | jkh <jkh@FreeBSD.org> | 1994-04-05 14:08:47 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1994-04-05 14:08:47 +0000 |
| commit | 68314379f2309f4a2f3b03c227d494a4d43aa7a1 (patch) | |
| tree | ac02b985aac39d049d15cea2a959286212a9b94f /usr.sbin/pkg_install/lib/msg.c | |
| parent | 4549480f2f521e96c7310bbfa8d999677c0dbf9b (diff) | |
| download | FreeBSD-src-68314379f2309f4a2f3b03c227d494a4d43aa7a1.zip FreeBSD-src-68314379f2309f4a2f3b03c227d494a4d43aa7a1.tar.gz | |
Make y_or_n() pay attention to AutoAnswer global.
Diffstat (limited to 'usr.sbin/pkg_install/lib/msg.c')
| -rw-r--r-- | usr.sbin/pkg_install/lib/msg.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/usr.sbin/pkg_install/lib/msg.c b/usr.sbin/pkg_install/lib/msg.c index 489fc47..12a2ff0 100644 --- a/usr.sbin/pkg_install/lib/msg.c +++ b/usr.sbin/pkg_install/lib/msg.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: msg.c,v 1.3 1993/09/04 05:06:50 jkh Exp $"; +static const char *rcsid = "$Id: msg.c,v 1.2 1993/09/03 23:01:15 jkh Exp $"; #endif /* @@ -80,14 +80,19 @@ y_or_n(Boolean def, const char *msg, ...) tty = fopen("/dev/tty", "r"); if (!tty) barf("Can't open /dev/tty!\n"); - while (ch != 'Y' && ch != 'N') { + while (ch != 'Y' && ch != 'N') { vfprintf(stderr, msg, args); if (def) fprintf(stderr, " [yes]? "); else fprintf(stderr, " [no]? "); fflush(stderr); - ch = toupper(fgetc(tty)); + if (AutoAnswer) { + ch = (AutoAnswer == YES) ? 'Y' : 'N'; + fprintf(stderr, "%c\n", ch); + } + else + ch = toupper(fgetc(tty)); if (ch == '\n') ch = (def) ? 'Y' : 'N'; } |
