rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
if (dry_run) {
- if (!am_server && verbose) { /* log transfer */
+ if (!am_server && verbose) {
rprintf(FINFO, "%s\n", fname+offset);
}
write_int(f_out, i);
full_fname(fname));
} else {
io_error |= IOERR_GENERAL;
- rprintf(FERROR, "send_files failed to open %s: %s\n",
- full_fname(fname), strerror(errno));
+ rsyserr(FERROR, errno,
+ "send_files failed to open %s",
+ full_fname(fname));
}
free_sums(s);
continue;
/* map the local file */
if (do_fstat(fd, &st) != 0) {
io_error |= IOERR_GENERAL;
- rprintf(FERROR, "fstat failed: %s\n", strerror(errno));
+ rsyserr(FERROR, errno, "fstat failed");
free_sums(s);
close(fd);
return;
if (verbose > 2 && !read_batch)
rprintf(FINFO, "calling match_sums %s\n", fname);
- if (!am_server && verbose) { /* log transfer */
+ if (!am_server && verbose) {
rprintf(FINFO, "%s\n", fname+offset);
}
write_buf(f_out, buff, buff_len);
}
}
- } /* end while */
+ }
read_batch_delta_file(buff, MD4_SUM_LENGTH);
write_buf(f_out, buff, MD4_SUM_LENGTH);
- } /* j=i */
+ }
} else { /* not checksum match */
rprintf (FINFO, "readbatch & checksums don't match\n");
rprintf (FINFO, "filename=%s is being skipped\n", fname);
continue;
}
- } else {
+ } else { /* not read_batch */
match_sums(f_out, s, mbuf, st.st_size);
log_send(file, &initial_stats);
}
j = unmap_file(mbuf);
if (j) {
io_error |= IOERR_GENERAL;
- rprintf(FERROR,
- "read errors mapping %s: (%d) %s\n",
- full_fname(fname), j, strerror(j));
+ rsyserr(FERROR, j,
+ "read errors mapping %s",
+ full_fname(fname));
}
}
close(fd);