- DIR *d;
- struct dirent *di;
- char buf[MAXPATHLEN];
- extern int force_delete;
- STRUCT_STAT st;
- int ret;
- extern int recurse;
-
- if (do_unlink(fname) == 0 || errno == ENOENT) return 0;
-
-#if SUPPORT_LINKS
- ret = do_lstat(fname, &st);
-#else
- ret = do_stat(fname, &st);
-#endif
- if (ret) {
- rprintf(FERROR,"stat(%s) : %s\n", fname, strerror(errno));
- return -1;
- }
-
- if (!S_ISDIR(st.st_mode)) {
- rprintf(FERROR,"unlink(%s) : %s\n", fname, strerror(errno));
- return -1;
- }
-
- if (do_rmdir(fname) == 0 || errno == ENOENT) return 0;
- if (!force_delete || !recurse ||
- (errno != ENOTEMPTY && errno != EEXIST)) {
- rprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno));
- return -1;
- }
-
- /* now we do a recsursive delete on the directory ... */
- d = opendir(fname);
- if (!d) {
- rprintf(FERROR,"opendir(%s): %s\n",
- fname,strerror(errno));
- return -1;
- }
-
- for (di=readdir(d); di; di=readdir(d)) {
- char *dname = d_name(di);
- if (strcmp(dname,".")==0 ||
- strcmp(dname,"..")==0)
- continue;
- slprintf(buf, sizeof(buf), "%s/%s", fname, dname);
- if (verbose > 0)
- rprintf(FINFO,"deleting %s\n", buf);
- if (delete_file(buf) != 0) {
- closedir(d);
- return -1;
- }
- }
-
- closedir(d);
-
- if (do_rmdir(fname) != 0) {
- rprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno));
- return -1;
- }
-
- return 0;
-}
-
-static int is_in_group(gid_t gid)
-{
-#ifdef HAVE_GETGROUPS
- static gid_t last_in = (gid_t) -2, last_out;
- static int ngroups = -2;
- static gid_t *gidset;
- int n;
-
- if (gid == last_in)
- return last_out;
- if (ngroups < -1) {
- /* treat failure (-1) as if not member of any group */
- ngroups = getgroups(0, 0);
- if (ngroups > 0) {
- gidset = (gid_t *) malloc(ngroups * sizeof(gid_t));
- ngroups = getgroups(ngroups, gidset);
- }
- }
-
- last_in = gid;
- last_out = 0;
- for (n = 0; n < ngroups; n++) {
- if (gidset[n] == gid) {
- last_out = 1;
- break;
+ /* 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;