From: Sergey Poznyakoff Date: Sun, 19 Feb 2006 21:12:50 +0000 (+0000) Subject: (new_volume): Prompt the user for archive name if unable to open next archive. X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=476019d08388d0db5c0cf1aeec5e8e32ebed073d;p=chaz%2Ftar (new_volume): Prompt the user for archive name if unable to open next archive. --- diff --git a/src/buffer.c b/src/buffer.c index 9b6a11a..81efe32 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -966,7 +966,8 @@ new_volume (enum access_mode mode) { static FILE *read_file; static int looped; - + int prompt; + if (!read_file && !info_script_option) /* FIXME: if fopen is used, it will never be closed. */ read_file = archive == STDIN_FILENO ? fopen (TTY_NAME, "r") : stdin; @@ -989,9 +990,10 @@ new_volume (enum access_mode mode) archive_name_cursor = archive_name_array; looped = 1; } - + prompt = looped; + tryagain: - if (looped) + if (prompt) { /* We have to prompt from now on. */ @@ -1041,6 +1043,7 @@ new_volume (enum access_mode mode) open_warn (*archive_name_cursor); if (!verify_option && mode == ACCESS_WRITE && backup_option) undo_last_backup (); + prompt = 1; goto tryagain; }