From 48a07301bbfe42ba387d13c77eb6bdd49ef289ed Mon Sep 17 00:00:00 2001 From: jkh Date: Fri, 17 Jan 1997 19:00:38 +0000 Subject: Be more aggressive about timeouts. --- release/sysinstall/dist.c | 4 +++- release/sysinstall/media.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'release') diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c index ea7a781..7bd3795 100644 --- a/release/sysinstall/dist.c +++ b/release/sysinstall/dist.c @@ -497,8 +497,10 @@ distExtract(char *parent, Distribution *me) alarm_set(MEDIA_TIMEOUT, media_timeout); n = fread(buf, 1, BUFSIZ, fp); alarm_clear(); - if (n <= 0 || AlarmWentOff) + if (n <= 0 || AlarmWentOff) { + msgConfirm("Read error on media (timeout or user abort).\n"); break; + } total += n; /* Print statistics about how we're doing */ diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c index cc8e2aa..af41a2d 100644 --- a/release/sysinstall/media.c +++ b/release/sysinstall/media.c @@ -599,11 +599,11 @@ mediaExtractDist(char *dir, char *dist, FILE *fp) while ((i = fread(buf, 1, BUFSIZ, fp)) > 0) { alarm_clear(); if (AlarmWentOff) { - msgDebug("Failure to read from media - timeout or user abort.\n"); + msgConfirm("Failure to read from media - timeout or user abort.\n"); break; } if (write(qfd[1], buf, i) != i) { - msgDebug("Write error on transfer to cpio process, try of %d bytes\n", i); + msgConfirm("Write error on transfer to cpio process, try of %d bytes\n", i); break; } else { -- cgit v1.1