Skip to content

L
liblongpath-rsync
Commit 0f86c74e authored by Wayne Davison's avatar Wayne Davison
Browse files
Options

Call renamed cmp_time() function (was cmp_modtime()).

parent c2b54076
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
generator.c
View file @ 0f86c74e
...@@ -347,7 +347,7 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st, ...@@ -347,7 +347,7 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
iflags |= ITEM_REPORT_SIZE; iflags |= ITEM_REPORT_SIZE;
if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
&& (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
|| (keep_time && cmp_modtime(file->modtime, st->st_mtime) != 0)) || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
iflags |= ITEM_REPORT_TIME; iflags |= ITEM_REPORT_TIME;
if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS)) if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS; iflags |= ITEM_REPORT_PERMS;
...@@ -396,7 +396,7 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) ...@@ -396,7 +396,7 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
if (ignore_times) if (ignore_times)
return 0; return 0;
return cmp_modtime(st->st_mtime, file->modtime) == 0; return cmp_time(st->st_mtime, file->modtime) == 0;
} }
...@@ -556,7 +556,7 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist) ...@@ -556,7 +556,7 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
name = fp->basename; name = fp->basename;
if (fp->length == file->length if (fp->length == file->length
&& cmp_modtime(fp->modtime, file->modtime) == 0) { && cmp_time(fp->modtime, file->modtime) == 0) {
if (verbose > 4) { if (verbose > 4) {
rprintf(FINFO, rprintf(FINFO,
"fuzzy size/modtime match for %s\n", "fuzzy size/modtime match for %s\n",
...@@ -632,7 +632,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, ...@@ -632,7 +632,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
if (!unchanged_attrs(file, stp)) if (!unchanged_attrs(file, stp))
continue; continue;
if ((always_checksum || ignore_times) if ((always_checksum || ignore_times)
&& cmp_modtime(stp->st_mtime, file->modtime)) && cmp_time(stp->st_mtime, file->modtime))
continue; continue;
best_match = j; best_match = j;
match_level = 3; match_level = 3;
...@@ -1073,7 +1073,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, ...@@ -1073,7 +1073,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
} }
if (update_only && statret == 0 if (update_only && statret == 0
&& cmp_modtime(st.st_mtime, file->modtime) > 0) { && cmp_time(st.st_mtime, file->modtime) > 0) {
if (verbose > 1) if (verbose > 1)
rprintf(FINFO, "%s is newer\n", fname); rprintf(FINFO, "%s is newer\n", fname);
return; return;
......
rsync.c
View file @ 0f86c74e
...@@ -146,7 +146,7 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, ...@@ -146,7 +146,7 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,
if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times)) if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
flags |= ATTRS_SKIP_MTIME; flags |= ATTRS_SKIP_MTIME;
if (!(flags & ATTRS_SKIP_MTIME) if (!(flags & ATTRS_SKIP_MTIME)
&& cmp_modtime(st->st_mtime, file->modtime) != 0) { && cmp_time(st->st_mtime, file->modtime) != 0) {
int ret = set_modtime(fname, file->modtime, st->st_mode); int ret = set_modtime(fname, file->modtime, st->st_mode);
if (ret < 0) { if (ret < 0) {
rsyserr(FERROR, errno, "failed to set times on %s", rsyserr(FERROR, errno, "failed to set times on %s",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment