right spot, and moved some externs.
extern int do_progress;
extern int am_server;
extern int always_checksum;
extern int do_progress;
extern int am_server;
extern int always_checksum;
+extern int module_id;
+extern int ignore_errors;
char *p;
char cleaned_name[MAXPATHLEN];
char linkbuf[MAXPATHLEN];
char *p;
char cleaned_name[MAXPATHLEN];
char linkbuf[MAXPATHLEN];
strlcpy(cleaned_name, fname, MAXPATHLEN);
cleaned_name[MAXPATHLEN - 1] = 0;
strlcpy(cleaned_name, fname, MAXPATHLEN);
cleaned_name[MAXPATHLEN - 1] = 0;
send_file_entry(NULL, f, 0);
send_file_entry(NULL, f, 0);
- if (show_filelist_p() && f != -1)
- finish_filelist_progress(flist);
+ if (show_filelist_p())
+ finish_filelist_progress(flist);
+ }
clean_flist(flist, 0, 0);
/* now send the uid/gid list. This was introduced in protocol
clean_flist(flist, 0, 0);
/* now send the uid/gid list. This was introduced in protocol
if (f != -1)
send_uid_list(f);
if (f != -1)
send_uid_list(f);
- /* send the io_error flag */
+ /* send the io_error flag */
write_int(f, lp_ignore_errors(module_id) ? 0 : io_error);
write_int(f, lp_ignore_errors(module_id) ? 0 : io_error);
io_end_buffering();
stats.flist_size = stats.total_written - start_write;
stats.num_files = flist->count;
io_end_buffering();
stats.flist_size = stats.total_written - start_write;
stats.num_files = flist->count;
if (verbose > 2)
rprintf(FINFO, "received %d names\n", flist->count);
if (verbose > 2)
rprintf(FINFO, "received %d names\n", flist->count);
- clean_flist(flist, relative_paths, 1);
-
if (show_filelist_p())
finish_filelist_progress(flist);
if (show_filelist_p())
finish_filelist_progress(flist);
+ clean_flist(flist, relative_paths, 1);
+
/* now recv the uid/gid list. This was introduced in protocol version 15 */
if (f != -1)
recv_uid_list(f, flist);
/* recv the io_error flag */
if (f != -1 && !read_batch) { /* dw-added readbatch */
/* now recv the uid/gid list. This was introduced in protocol version 15 */
if (f != -1)
recv_uid_list(f, flist);
/* recv the io_error flag */
if (f != -1 && !read_batch) { /* dw-added readbatch */
- extern int module_id;
- extern int ignore_errors;
if (lp_ignore_errors(module_id) || ignore_errors)
read_int(f);
else
if (lp_ignore_errors(module_id) || ignore_errors)
read_int(f);
else