- if (verbose)
- rprintf(FINFO, "deleting %s%s\n", safe_fname(buf),
- flags & DEL_DIR ? "/" : "");
- if (delete_file(buf, flags) != 0) {
- closedir(d);
- return -1;
+/* This is only called when we aren't preserving permissions. Figure out what
+ * the permissions should be and return them merged back into the mode. */
+mode_t dest_mode(mode_t flist_mode, mode_t dest_mode, int exists)
+{
+ /* If the file already exists, we'll return the local permissions,
+ * possibly tweaked by the --executability option. */
+ if (exists) {
+ if (preserve_executability && S_ISREG(flist_mode)) {
+ /* If the source file is executable, grant execute
+ * rights to everyone who can read, but ONLY if the
+ * file isn't already executable. */
+ if (!(flist_mode & 0111))
+ dest_mode &= ~0111;
+ else if (!(dest_mode & 0111))
+ dest_mode |= (dest_mode & 0444) >> 2;