mirrors/tar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(new_volume): Prompt the user for archive name if unable to open next archive.

Browse Source
This commit is contained in:
Sergey Poznyakoff
2006-02-19 21:12:50 +00:00
parent cf440a191f
commit 476019d083
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/buffer.c
View File

@@ -966,7 +966,8 @@ new_volume (enum access_mode mode)
{ {
static FILE *read_file; static FILE *read_file;
static int looped; static int looped;
int prompt;
if (!read_file && !info_script_option) if (!read_file && !info_script_option)
/* FIXME: if fopen is used, it will never be closed. */ /* FIXME: if fopen is used, it will never be closed. */
read_file = archive == STDIN_FILENO ? fopen (TTY_NAME, "r") : stdin; 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; archive_name_cursor = archive_name_array;
looped = 1; looped = 1;
} }
prompt = looped;
tryagain: tryagain:
if (looped) if (prompt)
{ {
/* We have to prompt from now on. */ /* We have to prompt from now on. */
@@ -1041,6 +1043,7 @@ new_volume (enum access_mode mode)
open_warn (*archive_name_cursor); open_warn (*archive_name_cursor);
if (!verify_option && mode == ACCESS_WRITE && backup_option) if (!verify_option && mode == ACCESS_WRITE && backup_option)
undo_last_backup (); undo_last_backup ();
prompt = 1;
goto tryagain; goto tryagain;
} }