extern int io_timeout;
extern int remote_version;
extern int always_checksum;
+extern char *compare_dest;
/* choose whether to skip a particular file */
of the file time to determine whether to sync */
if (always_checksum && S_ISREG(st->st_mode)) {
char sum[MD4_SUM_LENGTH];
+ char fnamecmpdest[MAXPATHLEN];
+
+ if (compare_dest != NULL) {
+ if (access(fname, 0) != 0) {
+ slprintf(fnamecmpdest,MAXPATHLEN,"%s/%s",
+ compare_dest,fname);
+ fname = fnamecmpdest;
+ }
+ }
file_checksum(fname,sum,st->st_size);
if (remote_version < 21) {
return (memcmp(sum,file->sum,2) == 0);
}
if (verbose > 3)
- rprintf(FINFO,"count=%d rem=%d n=%d flength=%d\n",
- s->count,s->remainder,s->n,(int)s->flength);
+ rprintf(FINFO,"count=%d rem=%d n=%d flength=%.0f\n",
+ s->count,s->remainder,s->n,(double)s->flength);
s->sums = (struct sum_buf *)malloc(sizeof(s->sums[0])*s->count);
if (!s->sums) out_of_memory("generate_sums");
s->sums[i].i = i;
if (verbose > 3)
- rprintf(FINFO,"chunk[%d] offset=%d len=%d sum1=%08x\n",
- i,(int)s->sums[i].offset,s->sums[i].len,s->sums[i].sum1);
+ rprintf(FINFO,"chunk[%d] offset=%.0f len=%d sum1=%08x\n",
+ i,(double)s->sums[i].offset,s->sums[i].len,s->sums[i].sum1);
len -= n1;
offset += n1;
extern char *compare_dest;
extern int list_only;
extern int preserve_perms;
+ extern int only_existing;
if (list_only) return;
statret = link_stat(fname,&st);
+ if (only_existing && statret == -1 && errno == ENOENT) {
+ /* we only want to update existing files */
+ if (verbose > 1) rprintf(FINFO,"not creating %s\n",fname);
+ return;
+ }
+
if (statret == 0 &&
!preserve_perms &&
(S_ISDIR(st.st_mode) == S_ISDIR(file->mode))) {
/* if the file exists already and we aren't perserving
presmissions then act as though the remote end sent
us the file permissions we already have */
- file->mode = st.st_mode;
+ file->mode = (file->mode & _S_IFMT) | (st.st_mode & ~_S_IFMT);
}
if (S_ISDIR(file->mode)) {
return;
}
}
+ delete_file(fname);
}
- delete_file(fname);
if (do_symlink(file->link,fname) != 0) {
- rprintf(FERROR,"link %s -> %s : %s\n",
+ rprintf(FERROR,"symlink %s -> %s : %s\n",
fname,file->link,strerror(errno));
} else {
set_perms(fname,file,NULL,0);
fd = do_open(fnamecmp, O_RDONLY, 0);
if (fd == -1) {
- rprintf(FERROR,"failed to open %s : %s\n",fnamecmp,strerror(errno));
- rprintf(FERROR,"skipping %s\n",fname);
+ rprintf(FERROR,"failed to open %s, continuing : %s\n",fnamecmp,strerror(errno));
+ /* pretend the file didn't exist */
+ write_int(f_out,i);
+ send_sums(NULL,f_out);
return;
}
}
if (verbose > 3)
- rprintf(FINFO,"gen mapped %s of size %d\n",fnamecmp,(int)st.st_size);
+ rprintf(FINFO,"gen mapped %s of size %.0f\n",fnamecmp,(double)st.st_size);
s = generate_sums(buf,st.st_size,adapt_block_size(file, block_size));