extern int block_size;
extern int csum_length;
extern int ignore_times;
+extern int size_only;
extern int io_timeout;
extern int remote_version;
extern int always_checksum;
return (memcmp(sum,file->sum,csum_length) == 0);
}
+ if (size_only) {
+ return 1;
+ }
+
if (ignore_times) {
return 0;
}
struct sum_struct *s;
int statret;
struct file_struct *file = flist->files[i];
+ char *fnamecmp;
+ char fnamecmpbuf[MAXPATHLEN];
+ extern char *compare_dest;
+ extern int list_only;
+
+ if (list_only) return;
if (verbose > 2)
rprintf(FINFO,"recv_generator(%s,%d)\n",fname,i);
if (S_ISDIR(file->mode)) {
if (dry_run) return;
if (statret == 0 && !S_ISDIR(st.st_mode)) {
- if (do_unlink(fname) != 0) {
+ if (robust_unlink(fname) != 0) {
rprintf(FERROR,"unlink %s : %s\n",fname,strerror(errno));
return;
}
return;
}
+ fnamecmp = fname;
+
+ if ((statret == -1) && (compare_dest != NULL)) {
+ /* try the file at compare_dest instead */
+ int saveerrno = errno;
+ slprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",compare_dest,fname);
+ statret = link_stat(fnamecmpbuf,&st);
+ if (!S_ISREG(st.st_mode))
+ statret = -1;
+ if (statret == -1)
+ errno = saveerrno;
+ else
+ fnamecmp = fnamecmpbuf;
+ }
+
if (statret == -1) {
if (errno == ENOENT) {
write_int(f_out,i);
return;
}
- if (update_only && st.st_mtime > file->modtime) {
+ if (update_only && st.st_mtime > file->modtime && fnamecmp == fname) {
if (verbose > 1)
rprintf(FINFO,"%s is newer\n",fname);
return;
}
/* open the file */
- fd = open(fname,O_RDONLY);
+ fd = open(fnamecmp,O_RDONLY);
if (fd == -1) {
- rprintf(FERROR,"failed to open %s : %s\n",fname,strerror(errno));
+ rprintf(FERROR,"failed to open %s : %s\n",fnamecmp,strerror(errno));
rprintf(FERROR,"skipping %s\n",fname);
return;
}
}
if (verbose > 3)
- rprintf(FINFO,"gen mapped %s of size %d\n",fname,(int)st.st_size);
+ rprintf(FINFO,"gen mapped %s of size %d\n",fnamecmp,(int)st.st_size);
s = generate_sums(buf,st.st_size,adapt_block_size(file, block_size));