X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/60c8d7bc7f693e568e6a60a82a433f8534b1e26e..81d538ce23f7348b156348a0ae56b3dcd51955d4:/generator.c diff --git a/generator.c b/generator.c index 8aa9c06f..1d1784fe 100644 --- a/generator.c +++ b/generator.c @@ -35,6 +35,7 @@ extern int size_only; extern int io_timeout; extern int remote_version; extern int always_checksum; +extern int modify_window; extern char *compare_dest; @@ -75,7 +76,7 @@ static int skip_file(char *fname, return 0; } - return (st->st_mtime == file->modtime); + return (cmp_modtime(st->st_mtime,file->modtime) == 0); } @@ -216,7 +217,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out) if (dry_run) return; if (statret == 0 && !S_ISDIR(st.st_mode)) { if (robust_unlink(fname) != 0) { - rprintf(FERROR,"unlink %s : %s\n",fname,strerror(errno)); + rprintf(FERROR,"recv_generator: unlink %s: %s\n",fname,strerror(errno)); return; } statret = -1; @@ -343,7 +344,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out) return; } - if (update_only && st.st_mtime > file->modtime && fnamecmp == fname) { + if (update_only && cmp_modtime(st.st_mtime,file->modtime)>0 && fnamecmp == fname) { if (verbose > 1) rprintf(FINFO,"%s is newer\n",fname); return;