From 7308bd66e0d5e5d2d04e41b0052879b4f3283109 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 24 Mar 1998 06:39:16 +0000 Subject: [PATCH] added chmod() and chown() to syscall.c --- rsync.c | 4 ++-- syscall.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/rsync.c b/rsync.c index 1be378f6..45604551 100644 --- a/rsync.c +++ b/rsync.c @@ -223,7 +223,7 @@ static int set_perms(char *fname,struct file_struct *file,struct stat *st, if (preserve_perms && !S_ISLNK(st->st_mode) && st->st_mode != file->mode) { updated = 1; - if (chmod(fname,file->mode) != 0) { + if (do_chmod(fname,file->mode) != 0) { fprintf(FERROR,"failed to set permissions on %s : %s\n", fname,strerror(errno)); return 0; @@ -234,7 +234,7 @@ static int set_perms(char *fname,struct file_struct *file,struct stat *st, if ((am_root && preserve_uid && st->st_uid != file->uid) || (preserve_gid && st->st_gid != file->gid)) { updated = 1; - if (lchown(fname, + if (do_lchown(fname, (am_root&&preserve_uid)?file->uid:-1, preserve_gid?file->gid:-1) != 0) { if (verbose>1 || preserve_uid) diff --git a/syscall.c b/syscall.c index d92cb314..8905381f 100644 --- a/syscall.c +++ b/syscall.c @@ -42,6 +42,12 @@ int do_link(char *fname1, char *fname2) return link(fname1, fname2); } +int do_lchown(const char *path, uid_t owner, gid_t group) +{ + if (dry_run) return 0; + return lchown(path, owner, group); +} + int do_mknod(char *pathname, mode_t mode, dev_t dev) { if (dry_run) return 0; @@ -59,3 +65,9 @@ int do_open(char *pathname, int flags, mode_t mode) if (dry_run) return -1; return open(pathname, flags, mode); } + +int do_chmod(const char *path, mode_t mode) +{ + if (dry_run) return 0; + return chmod(path, mode); +} -- 2.34.1