diff options
| author | jkh <jkh@FreeBSD.org> | 1997-01-19 09:55:37 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1997-01-19 09:55:37 +0000 |
| commit | 1d0095968bbcdd83e153873f85d70bd88bf7f314 (patch) | |
| tree | fe9faa87675730a426625b5c6186afd3ad62b7de /release/sysinstall/media.c | |
| parent | 45f24bb16eb909ab1f7566fbf4a770f73f6543b5 (diff) | |
| download | FreeBSD-src-1d0095968bbcdd83e153873f85d70bd88bf7f314.zip FreeBSD-src-1d0095968bbcdd83e153873f85d70bd88bf7f314.tar.gz | |
Use alarm's return status to more properly denote timeout rather than keeping
an icky global around.
Diffstat (limited to 'release/sysinstall/media.c')
| -rw-r--r-- | release/sysinstall/media.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c index 288508a..64a0d48 100644 --- a/release/sysinstall/media.c +++ b/release/sysinstall/media.c @@ -521,7 +521,7 @@ mediaExtractDistEnd(int zpid, int cpid) static void media_timeout(int sig) { - AlarmWentOff = TRUE; + alarm(0); } /* Return the timeout interval */ @@ -612,8 +612,7 @@ mediaExtractDist(char *dir, char *dist, FILE *fp) alarm_set(mediaTimeout(), media_timeout); while ((i = fread(buf, 1, BUFSIZ, fp)) > 0) { - alarm_clear(); - if (AlarmWentOff) { + if (!alarm_clear()) { msgConfirm("Failure to read from media - timeout or user abort.\n"); break; } |
