d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop restore from looping under certain error conditions. This

Browse Source 
corrects cases where restore would spew an infinite stream of
"Changing volumes on pipe input?" messages, or would loop waiting
for a response to the "set owner/mode for '.'" question.

PR:		bin/14250
Reviewed by:	dwmalone
This commit is contained in:
Ian Dowse 2000-12-12 12:04:02 +00:00
parent 040639a0aa
commit 5a59cccc61
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=69906
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sbin/restore/interactive.c
View File

@ -325,12 +325,11 @@ getcmd(curdir, cmd, name, size, ap)
do {
fprintf(stderr, "restore > ");
(void) fflush(stderr);
(void) fgets(input, BUFSIZ, terminal);
} while (!feof(terminal) && input[0] == '\n');
if (feof(terminal)) {
(void) strcpy(cmd, "quit");
return;
}
if (fgets(input, BUFSIZ, terminal) == NULL) {
strcpy(cmd, "quit");
return;
}
} while (input[0] == '\n');
for (cp = &input[strlen(input) - 2]; *cp == ' ' || *cp == '\t'; cp--)
/* trim off trailing white space and newline */;
*++cp = '\0';

16
sbin/restore/tape.c
View File

@ -307,8 +307,12 @@ getvol(nextvol)
gettingfile = 0;
}
if (pipein) {
if (nextvol != 1)
if (nextvol != 1) {
panic("Changing volumes on pipe input?\n");
/* Avoid looping if we couldn't ask the user. */
if (yflag || ferror(terminal) || feof(terminal))
done(1);
}
if (volno == 1)
return;
goto gethdr;
@ -345,10 +349,9 @@ getvol(nextvol)
do {
fprintf(stderr, "Specify next volume #: ");
(void) fflush(stderr);
(void) fgets(buf, BUFSIZ, terminal);
} while (!feof(terminal) && buf[0] == '\n');
if (feof(terminal))
done(1);
if (fgets(buf, BUFSIZ, terminal) == NULL)
done(1);
} while (buf[0] == '\n');
newvol = atoi(buf);
if (newvol <= 0) {
fprintf(stderr,
@ -364,8 +367,7 @@ getvol(nextvol)
fprintf(stderr, "Enter ``none'' if there are no more tapes\n");
fprintf(stderr, "otherwise enter tape name (default: %s) ", magtape);
(void) fflush(stderr);
(void) fgets(buf, BUFSIZ, terminal);
if (feof(terminal))
if (fgets(buf, BUFSIZ, terminal) == NULL)
done(1);
if (!strcmp(buf, "none\n")) {
terminateinput();

4
sbin/restore/utilities.c
View File

@ -405,14 +405,14 @@ int
reply(question)
char *question;
{
char c;
int c;
do {
fprintf(stderr, "%s? [yn] ", question);
(void) fflush(stderr);
c = getc(terminal);
while (c != '\n' && getc(terminal) != '\n')
if (feof(terminal))
if (c == EOF)
return (FAIL);
} while (c != 'y' && c != 'n');
if (c == 'y')