{
struct file_list *local_file_list;
int i, j;
- char *name, fbuf[MAXPATHLEN];
+ char *argv[1], fbuf[MAXPATHLEN];
extern int module_id;
extern int ignore_errors;
extern int max_delete;
if (!S_ISDIR(flist->files[j]->mode) ||
!(flist->files[j]->flags & FLAG_DELETE)) continue;
- name = f_name_to(flist->files[j], fbuf, sizeof fbuf);
+ argv[0] = f_name_to(flist->files[j], fbuf);
- if (!(local_file_list = send_file_list(-1,1,&name)))
+ if (!(local_file_list = send_file_list(-1, 1, argv)))
continue;
if (verbose > 1)
- rprintf(FINFO,"deleting in %s\n", name);
+ rprintf(FINFO,"deleting in %s\n", fbuf);
for (i = local_file_list->count-1; i >= 0; i--) {
if (max_delete && deletion_count > max_delete) break;
int maxname;
if (tmpdir) {
- strlcpy(fnametmp, tmpdir, MAXPATHLEN - 2);
- length = strlen(fnametmp);
+ /* Note: this can't overflow, so the return value is safe */
+ length = strlcpy(fnametmp, tmpdir, MAXPATHLEN - 2);
fnametmp[length++] = '/';
fnametmp[length] = '\0'; /* always NULL terminated */
}
* main routine for receiver process.
*
* Receiver process runs on the same host as the generator process. */
-int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
+int recv_files(int f_in,struct file_list *flist,char *local_name)
{
int fd1,fd2;
STRUCT_STAT st;
i = read_int(f_in);
if (i == -1) {
- if (phase==0) {
+ if (phase == 0) {
phase++;
csum_length = SUM_LENGTH;
if (verbose > 2)
rprintf(FINFO,"recv_files phase=%d\n",phase);
- write_int(f_gen,-1);
+ send_msg(MSG_DONE, "", 0);
continue;
}
break;
file = flist->files[i];
+ stats.current_file_index = i;
stats.num_transferred_files++;
stats.total_transferred_size += file->length;
cleanup_got_literal = 0;
if (local_name)
fname = local_name;
else
- fname = f_name_to(file, fbuf, sizeof fbuf);
+ fname = f_name_to(file, fbuf);
if (dry_run) {
if (!am_server && verbose) { /* log transfer */
rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n",
full_fname(fname));
} else {
+ char buf[4];
if (verbose > 1)
rprintf(FINFO,"redoing %s(%d)\n",fname,i);
- write_int(f_gen,i);
+ SIVAL(buf, 0, i);
+ send_msg(MSG_REDO, buf, 4);
}
}
}
for (i = 0; i < flist->count; i++) {
file = flist->files[i];
if (!file->basename || !S_ISDIR(file->mode)) continue;
- recv_generator(local_name? local_name
- : f_name_to(file,fbuf,sizeof fbuf), file, i, -1);
+ recv_generator(local_name ? local_name : f_name_to(file, fbuf),
+ file, i, -1);
}
if (verbose > 2)