- DIR *d;
- struct dirent *di;
- char buf[MAXPATHLEN];
- STRUCT_STAT st;
- int zap_dir;
-
- if (!S_ISDIR(mode)) {
- if (robust_unlink(fname) == 0) {
- if ((verbose || log_format) && !(flags & DEL_TERSE))
- log_delete(fname, mode);
- return 0;
- }
- if (errno == ENOENT)
- return 0;
- rsyserr(FERROR, errno, "delete_file: unlink %s failed",
- full_fname(fname));
- return -1;
- }
-
- zap_dir = (flags & DEL_FORCE_RECURSE || (force_delete && recurse))
- && !(flags & DEL_NO_RECURSE);
- if (dry_run && zap_dir)
- errno = ENOTEMPTY;
- else if (do_rmdir(fname) == 0) {
- if ((verbose || log_format) && !(flags & DEL_TERSE))
- log_delete(fname, mode);
- return 0;
- }
- if (errno == ENOENT)
- return 0;
- if (!zap_dir || (errno != ENOTEMPTY && errno != EEXIST)) {
- rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
- full_fname(fname));
- return -1;
- }
-
- /* now we do a recsursive delete on the directory ... */
- if (!(d = opendir(fname))) {
- rsyserr(FERROR, errno, "delete_file: opendir %s failed",
- full_fname(fname));
- return -1;
- }
-
- if (!(flags & DEL_TERSE)) {
- if (verbose || log_format)
- log_delete(fname, mode);
- flags |= DEL_TERSE;
- }
-
- for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
- char *dname = d_name(di);
- if (dname[0] == '.' && (dname[1] == '\0'
- || (dname[1] == '.' && dname[2] == '\0')))
- continue;
- pathjoin(buf, sizeof buf, fname, dname);
-
- if (do_lstat(buf, &st) < 0)
- continue;
- if (verbose || log_format)
- log_delete(buf, st.st_mode);
- if (delete_file(buf, st.st_mode, flags) != 0) {
- closedir(d);
- return -1;
+ int new_mode;
+ /* If the file already exists, we'll return the local permissions,
+ * possibly tweaked by the --executability option. */
+ if (exists) {
+ new_mode = (flist_mode & ~CHMOD_BITS) | (stat_mode & CHMOD_BITS);
+ 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))
+ new_mode &= ~0111;
+ else if (!(stat_mode & 0111))
+ new_mode |= (new_mode & 0444) >> 2;