=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/uploader.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- src/usr.bin/rsync/uploader.c 2019/03/23 16:04:28 1.19 +++ src/usr.bin/rsync/uploader.c 2019/04/02 11:05:55 1.20 @@ -1,4 +1,4 @@ -/* $Id: uploader.c,v 1.19 2019/03/23 16:04:28 deraadt Exp $ */ +/* $Id: uploader.c,v 1.20 2019/04/02 11:05:55 deraadt Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons * Copyright (c) 2019 Florian Obser @@ -624,8 +624,7 @@ */ if (u->newdir[idx] || - (sess->opts->preserve_perms && - st.st_mode != f->st.mode)) { + (sess->opts->preserve_perms && st.st_mode != f->st.mode)) { rc = fchmodat(u->rootfd, f->path, f->st.mode, 0); if (rc == -1) { ERR(sess, "%s: fchmodat", f->path); @@ -1017,7 +1016,7 @@ if (!sess->opts->preserve_times && - !sess->opts->preserve_perms) + !sess->opts->preserve_perms) return 1; LOG2(sess, "fixing up directory times and permissions");