- fprintf(stderr,"send_files starting\n");
-
- while (1)
- {
- i = read_int(f_in);
- if (i == -1) break;
-
- fname[0] = 0;
- if (flist->files[i].dir) {
- strcpy(fname,flist->files[i].dir);
- strcat(fname,"/");
- }
- strcat(fname,flist->files[i].name);
-
- if (verbose > 2)
- fprintf(stderr,"send_files(%d,%s)\n",i,fname);
-
- if (dry_run) {
- if (!am_server && verbose)
- printf("%s\n",fname);
- write_int(f_out,i);
- continue;
- }
-
- s = receive_sums(f_in);
- if (!s) {
- fprintf(stderr,"receive_sums failed\n");
- return -1;
- }
-
- fd = open(fname,O_RDONLY);
- if (fd == -1) {
- fprintf(stderr,"send_files failed to open %s: %s\n",
- fname,strerror(errno));
- continue;
- }
-
- /* map the local file */
- if (fstat(fd,&st) != 0) {
- fprintf(stderr,"fstat failed : %s\n",strerror(errno));
- return -1;
- }
-
- if (st.st_size > 0) {
- buf = map_file(fd,st.st_size);
- if (!buf) {
- fprintf(stderr,"map_file failed : %s\n",strerror(errno));
- return -1;
- }
- } else {
- buf = NULL;
- }
-
- if (verbose > 2)
- fprintf(stderr,"send_files mapped %s of size %d\n",
- fname,(int)st.st_size);
-
- write_int(f_out,i);
-
- write_int(f_out,s->count);
- write_int(f_out,s->n);
- write_int(f_out,s->remainder);
-
- if (verbose > 2)
- fprintf(stderr,"calling match_sums %s\n",fname);
-
- if (!am_server && verbose)
- printf("%s\n",fname);
-
- match_sums(f_out,s,buf,st.st_size);
- write_flush(f_out);
-
- unmap_file(buf,st.st_size);
- close(fd);
-
- free_sums(s);
-
- if (verbose > 2)
- fprintf(stderr,"sender finished %s\n",fname);
+ rprintf(FINFO,"send_files starting\n");
+
+ setup_nonblocking(f_in,f_out);
+
+ while (1) {
+ i = read_int(f_in);
+ if (i == -1) {
+ if (phase==0 && remote_version >= 13) {
+ phase++;
+ csum_length = SUM_LENGTH;
+ write_int(f_out,-1);
+ write_flush(f_out);
+ if (verbose > 2)
+ rprintf(FINFO,"send_files phase=%d\n",phase);
+ continue;
+ }
+ break;
+ }
+
+ file = flist->files[i];
+
+ fname[0] = 0;
+ if (file->basedir) {
+ strlcpy(fname,file->basedir,MAXPATHLEN-1);
+ if (strlen(fname) == MAXPATHLEN-1) {
+ io_error = 1;
+ rprintf(FERROR, "send_files failed on long-named directory %s\n",
+ fname);
+ return;
+ }
+ strcat(fname,"/");
+ offset = strlen(file->basedir)+1;
+ }
+ strncat(fname,f_name(file),MAXPATHLEN-strlen(fname));
+
+ if (verbose > 2)
+ rprintf(FINFO,"send_files(%d,%s)\n",i,fname);
+
+ if (dry_run) {
+ if (!am_server && verbose)
+ printf("%s\n",fname);
+ write_int(f_out,i);
+ continue;
+ }
+
+ s = receive_sums(f_in);
+ if (!s) {
+ io_error = 1;
+ rprintf(FERROR,"receive_sums failed\n");
+ return;
+ }
+
+ fd = open(fname,O_RDONLY);
+ if (fd == -1) {
+ io_error = 1;
+ rprintf(FERROR,"send_files failed to open %s: %s\n",
+ fname,strerror(errno));
+ free_sums(s);
+ continue;
+ }
+
+ /* map the local file */
+ if (do_fstat(fd,&st) != 0) {
+ io_error = 1;
+ rprintf(FERROR,"fstat failed : %s\n",strerror(errno));
+ free_sums(s);
+ close(fd);
+ return;
+ }
+
+ if (st.st_size > 0) {
+ buf = map_file(fd,st.st_size);
+ } else {
+ buf = NULL;
+ }
+
+ if (verbose > 2)
+ rprintf(FINFO,"send_files mapped %s of size %d\n",
+ fname,(int)st.st_size);
+
+ write_int(f_out,i);
+
+ write_int(f_out,s->count);
+ write_int(f_out,s->n);
+ write_int(f_out,s->remainder);
+
+ if (verbose > 2)
+ rprintf(FINFO,"calling match_sums %s\n",fname);
+
+ if (!am_server && verbose)
+ printf("%s\n",fname+offset);
+
+ match_sums(f_out,s,buf,st.st_size);
+ write_flush(f_out);
+
+ if (buf) unmap_file(buf);
+ close(fd);
+
+ free_sums(s);
+
+ if (verbose > 2)
+ rprintf(FINFO,"sender finished %s\n",fname);
+ }