mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-02-05 20:52:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Restoring correct skip_file() return semantics.

Browse Source
This commit is contained in:
Wayne Davison
2004-06-23 21:21:19 +00:00
parent cc1e997dcd
commit 84acca07ae
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
generator.c
View File

@@ -61,18 +61,18 @@ extern struct exclude_list_struct server_exclude_list;
static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st)
{
if (st->st_size != file->length)
return 1;
return 0;
if (link_dest) {
if (preserve_perms
&& (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
return 1;
return 0;
if (am_root && preserve_uid && st->st_uid != file->uid)
return 1;
return 0;
if (preserve_gid && file->gid != GID_NONE
&& st->st_gid != file->gid)
return 1;
return 0;
}
/* if always checksum is set then we use the checksum instead
@@ -90,16 +90,16 @@ static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st)
}
file_checksum(fname,sum,st->st_size);
return memcmp(sum, file->u.sum, protocol_version < 21 ? 2
: MD4_SUM_LENGTH) != 0;
: MD4_SUM_LENGTH) == 0;
}
if (size_only)
return 0;
if (ignore_times)
return 1;
return cmp_modtime(st->st_mtime, file->modtime) != 0;
if (ignore_times)
return 0;
return cmp_modtime(st->st_mtime, file->modtime) == 0;
}
@@ -488,7 +488,7 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
return;
}
if (!skip_file(fname, file, &st)) {
if (skip_file(fname, file, &st)) {
if (fnamecmp == fname)
set_perms(fname, file, &st, PERMS_REPORT);
return;