Avoid a hang when using at least 3 --verbose options on a transfer with

a client sender (which includes local copying).
This commit is contained in:
Wayne Davison
2008-12-28 17:51:36 -08:00
parent 9938bad34a
commit b64ae8b3b4
2 changed files with 7 additions and 0 deletions

3
NEWS
View File

@@ -42,6 +42,9 @@ Changes since 3.0.4:
- Fixed a bug when using --sparse on a sparse file that has over 2GB of
consecutive sparse data.
- Avoid a hang when using at least 3 --verbose options on a transfer with a
client sender (which includes local copying).
- Fixed a problem with --delete-delay reporting an error when it was ready
to remove a directory that was now gone.

View File

@@ -2246,6 +2246,7 @@ struct file_list *recv_file_list(int f)
struct file_list *flist;
int dstart, flags;
int64 start_read;
int save_verbose = verbose;
if (!first_flist)
rprintf(FLOG, "receiving file list\n");
@@ -2272,6 +2273,8 @@ struct file_list *recv_file_list(int f)
dstart = 0;
}
if (am_server && verbose > 2)
verbose = 2;
while ((flags = read_byte(f)) != 0) {
struct file_struct *file;
@@ -2296,6 +2299,7 @@ struct file_list *recv_file_list(int f)
}
}
file_total += flist->used;
verbose = save_verbose;
if (verbose > 2)
rprintf(FINFO, "received %d names\n", flist->used);