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;
if (always_checksum && S_ISREG(st->st_mode)) {
char sum[MD4_SUM_LENGTH];
file_checksum(fname,sum,st->st_size);
- return (memcmp(sum,file->sum,csum_length) == 0);
+ if (remote_version < 21) {
+ return (memcmp(sum,file->sum,2) == 0);
+ } else {
+ return (memcmp(sum,file->sum,MD4_SUM_LENGTH) == 0);
+ }
+ }
+
+ if (size_only) {
+ return 1;
}
if (ignore_times) {
static void send_sums(struct sum_struct *s,int f_out)
{
int i;
-
- /* tell the other guy how many we are going to be doing and how many
- bytes there are in the last chunk */
+
+ /* tell the other guy how many we are going to be doing and how many
+ bytes there are in the last chunk */
write_int(f_out,s?s->count:0);
write_int(f_out,s?s->n:block_size);
write_int(f_out,s?s->remainder:0);
- if (s)
- for (i=0;i<s->count;i++) {
- write_int(f_out,s->sums[i].sum1);
- write_buf(f_out,s->sums[i].sum2,csum_length);
- }
+
+ if (!s) return;
+
+ for (i=0;i<s->count;i++) {
+ write_int(f_out,s->sums[i].sum1);
+ write_buf(f_out,s->sums[i].sum2,csum_length);
+ }
}
}
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;
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;
+ extern int preserve_perms;
+ extern int only_existing;
+
+ if (list_only) return;
if (verbose > 2)
rprintf(FINFO,"recv_generator(%s,%d)\n",fname,i);
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 = (file->mode & _S_IFMT) | (st.st_mode & ~_S_IFMT);
+ }
+
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;
}
if (skip_file(fname, file, &st)) {
- set_perms(fname,file,&st,1);
+ if (fnamecmp == fname)
+ set_perms(fname,file,&st,1);
return;
}
}
/* open the file */
- fd = open(fname,O_RDONLY);
+ fd = do_open(fnamecmp, O_RDONLY, 0);
if (fd == -1) {
- rprintf(FERROR,"failed to open %s : %s\n",fname,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",fname,(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));