From bb24028f51bac18097e688c1459924f648bc407e Mon Sep 17 00:00:00 2001 From: "J.W. Schultz" Date: Wed, 26 Mar 2003 20:26:06 +0000 Subject: [PATCH] Make link-dest aware of --perms, --owner and --group. ---- Chris Darroch --- generator.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/generator.c b/generator.c index 3552887e..84264dcc 100644 --- a/generator.c +++ b/generator.c @@ -52,12 +52,19 @@ static int skip_file(char *fname, return 0; } if (link_dest) { - if((st->st_mode & ~_S_IFMT) != (file->mode & ~_S_IFMT)) { + extern int preserve_perms; + extern int preserve_uid; + extern int preserve_gid; + + if((preserve_perms + && st->st_mode & ~_S_IFMT) != (file->mode & ~_S_IFMT)) return 0; - } - if (st->st_uid != file->uid || st->st_gid != file->gid) { + + if (preserve_uid && st->st_uid != file->uid) + return 0; + + if (preserve_gid && st->st_gid != file->gid) return 0; - } } /* if always checksum is set then we use the checksum instead -- 2.34.1