- DIR *d;
- struct dirent *di;
- char buf[MAXPATHLEN];
- extern int force_delete;
- STRUCT_STAT st;
- int ret;
- extern int recurse;
-
-#if SUPPORT_LINKS
- ret = do_lstat(fname, &st);
-#else
- ret = do_stat(fname, &st);
-#endif
- if (ret) {
- return -1;
- }
-
- if (!S_ISDIR(st.st_mode)) {
- if (robust_unlink(fname) == 0 || errno == ENOENT) return 0;
- rprintf(FERROR, "delete_file: unlink %s failed: %s\n",
- full_fname(fname), strerror(errno));
- return -1;
- }
-
- if (do_rmdir(fname) == 0 || errno == ENOENT) return 0;
- if (!force_delete || !recurse ||
- (errno != ENOTEMPTY && errno != EEXIST)) {
- rprintf(FERROR, "delete_file: rmdir %s failed: %s\n",
- full_fname(fname), strerror(errno));
- return -1;
- }
-
- /* now we do a recsursive delete on the directory ... */
- d = opendir(fname);
- if (!d) {
- rprintf(FERROR, "delete_file: opendir %s failed: %s\n",
- full_fname(fname), strerror(errno));
- return -1;
- }
-
- for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
- char *dname = d_name(di);
- if (strcmp(dname,".") == 0
- || strcmp(dname,"..") == 0)
- continue;
- pathjoin(buf, sizeof buf, fname, dname);
- if (verbose > 0)
- rprintf(FINFO,"deleting %s\n", buf);
- if (delete_file(buf) != 0) {
- closedir(d);
- return -1;
+ /* 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))
+ cur_mode &= ~0111;
+ else if (!(cur_mode & 0111))
+ cur_mode |= (cur_mode & 0444) >> 2;