X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/83235dbc546d74ee325bb09b602bd62313fea793..19284e2ef8496f995e2f8dc710ba6482922dc39f:/generator.c diff --git a/generator.c b/generator.c index 35cbb572..c64b2474 100644 --- a/generator.c +++ b/generator.c @@ -91,6 +91,7 @@ extern int one_file_system; extern struct stats stats; extern dev_t filesystem_dev; extern mode_t orig_umask; +extern uid_t our_uid; extern char *backup_dir; extern char *backup_suffix; extern int backup_suffix_len; @@ -113,7 +114,8 @@ static int need_retouch_dir_perms; static const char *solo_file = NULL; /* For calling delete_item() and delete_dir_contents(). */ -#define DEL_RECURSE (1<<1) /* recurse */ +#define DEL_OWNED_BY_US (1<<0) /* file/dir has our uid */ +#define DEL_RECURSE (1<<1) /* if dir, delete all contents */ #define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */ enum nonregtype { @@ -151,6 +153,9 @@ static enum delret delete_item(char *fbuf, int mode, char *replace, int flags) fbuf, mode, flags); } + if (!am_root && !(mode & S_IWUSR) && flags & DEL_OWNED_BY_US) + do_chmod(fbuf, mode |= S_IWUSR); + if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) { ignore_perishable = 1; /* If DEL_RECURSE is not set, this just reports emptiness. */ @@ -258,10 +263,17 @@ static enum delret delete_dir_contents(char *fname, int flags) } strlcpy(p, fp->basename, remainder); + if (F_OWNER(fp) == our_uid) + flags |= DEL_OWNED_BY_US; + else + flags &= DEL_OWNED_BY_US; /* Save stack by recursing to ourself directly. */ - if (S_ISDIR(fp->mode) - && delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS) - ret = DR_NOT_EMPTY; + if (S_ISDIR(fp->mode)) { + if (!am_root && !(fp->mode & S_IWUSR) && flags & DEL_OWNED_BY_US) + do_chmod(fname, fp->mode |= S_IWUSR); + if (delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS) + ret = DR_NOT_EMPTY; + } if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS) ret = DR_NOT_EMPTY; } @@ -312,14 +324,17 @@ static int flush_delete_delay(void) return 1; } -static int remember_delete(struct file_struct *file, const char *fname) +static int remember_delete(struct file_struct *file, const char *fname, int flags) { + const char *plus = (!am_root && !(file->mode & S_IWUSR) && flags & DEL_OWNED_BY_US) + ? "+" : ""; int len; while (1) { len = snprintf(deldelay_buf + deldelay_cnt, deldelay_size - deldelay_cnt, - "%x %s%c", (int)file->mode, fname, '\0'); + "%s%x %s%c", + plus, (int)file->mode, fname, '\0'); if ((deldelay_cnt += len) <= deldelay_size) break; if (deldelay_fd < 0 && !start_delete_delay_temp()) @@ -332,7 +347,7 @@ static int remember_delete(struct file_struct *file, const char *fname) return 1; } -static int read_delay_line(char *buf) +static int read_delay_line(char *buf, int *own_flag_p) { static int read_pos = 0; int j, len, mode; @@ -373,6 +388,11 @@ static int read_delay_line(char *buf) } bp = deldelay_buf + read_pos; + if (*bp == '+') { + bp++; + *own_flag_p = DEL_OWNED_BY_US; + } else + *own_flag_p = 0; if (sscanf(bp, "%x ", &mode) != 1) { invalid_data: @@ -397,15 +417,15 @@ static int read_delay_line(char *buf) static void do_delayed_deletions(char *delbuf) { - int mode; + int mode, own_flag; if (deldelay_fd >= 0) { if (deldelay_cnt && !flush_delete_delay()) return; lseek(deldelay_fd, 0, 0); } - while ((mode = read_delay_line(delbuf)) >= 0) - delete_item(delbuf, mode, NULL, DEL_RECURSE); + while ((mode = read_delay_line(delbuf, &own_flag)) >= 0) + delete_item(delbuf, mode, NULL, own_flag | DEL_RECURSE); if (deldelay_fd >= 0) close(deldelay_fd); } @@ -467,12 +487,14 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev) continue; } if (flist_find(cur_flist, fp) < 0) { + int flags = DEL_RECURSE + | (F_OWNER(fp) == our_uid ? DEL_OWNED_BY_US : 0); f_name(fp, delbuf); if (delete_during == 2) { - if (!remember_delete(fp, delbuf)) + if (!remember_delete(fp, delbuf, flags)) break; } else - delete_item(delbuf, fp->mode, NULL, DEL_RECURSE); + delete_item(delbuf, fp->mode, NULL, flags); } } @@ -945,10 +967,6 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, return -1; if (itemizing) itemize(cmpbuf, file, ndx, 0, sxp, ITEM_LOCAL_CHANGE, 0, NULL); -#ifdef SUPPORT_XATTRS - if (preserve_xattrs) - xattr_clear_locals(file); -#endif if (maybe_ATTRS_REPORT && ((!itemizing && verbose && match_level == 2) || (verbose > 1 && match_level == 3))) { @@ -1283,6 +1301,9 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, return; } + if (statret == 0 && F_OWNER(file) == our_uid) + del_opts |= DEL_OWNED_BY_US; + if (S_ISDIR(file->mode)) { if (!implied_dirs && file->flags & FLAG_IMPLIED_DIR) goto cleanup; @@ -1897,57 +1918,63 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo) char fbuf[MAXPATHLEN]; int ndx; + while (1) { #ifdef SUPPORT_HARD_LINKS - while (preserve_hard_links && (ndx = get_hlink_num()) != -1) { - flist = flist_for_ndx(ndx); - assert(flist != NULL); - file = flist->files[ndx - flist->ndx_start]; - assert(file->flags & FLAG_HLINKED); - finish_hard_link(file, f_name(file, fbuf), ndx, NULL, itemizing, code, -1); - flist->in_progress--; - } + if (preserve_hard_links && (ndx = get_hlink_num()) != -1) { + flist = flist_for_ndx(ndx); + assert(flist != NULL); + file = flist->files[ndx - flist->ndx_start]; + assert(file->flags & FLAG_HLINKED); + finish_hard_link(file, f_name(file, fbuf), ndx, NULL, itemizing, code, -1); + flist->in_progress--; + continue; + } #endif - while (check_redo && (ndx = get_redo_num()) != -1) { - csum_length = SUM_LENGTH; - max_size = -max_size; - min_size = -min_size; - ignore_existing = -ignore_existing; - ignore_non_existing = -ignore_non_existing; - update_only = -update_only; - always_checksum = -always_checksum; - size_only = -size_only; - append_mode = -append_mode; - make_backups = -make_backups; /* avoid dup backup w/inplace */ - ignore_times++; - - flist = cur_flist; - cur_flist = flist_for_ndx(ndx); - - file = cur_flist->files[ndx - cur_flist->ndx_start]; - if (solo_file) - strlcpy(fbuf, solo_file, sizeof fbuf); - else - f_name(file, fbuf); - recv_generator(fbuf, file, ndx, itemizing, code, sock_f_out); - cur_flist->to_redo--; - - cur_flist = flist; - - csum_length = SHORT_SUM_LENGTH; - max_size = -max_size; - min_size = -min_size; - ignore_existing = -ignore_existing; - ignore_non_existing = -ignore_non_existing; - update_only = -update_only; - always_checksum = -always_checksum; - size_only = -size_only; - append_mode = -append_mode; - make_backups = -make_backups; - ignore_times--; - } - - while (cur_flist != first_flist) { /* only possible with inc_recurse */ + if (check_redo && (ndx = get_redo_num()) != -1) { + csum_length = SUM_LENGTH; + max_size = -max_size; + min_size = -min_size; + ignore_existing = -ignore_existing; + ignore_non_existing = -ignore_non_existing; + update_only = -update_only; + always_checksum = -always_checksum; + size_only = -size_only; + append_mode = -append_mode; + make_backups = -make_backups; /* avoid dup backup w/inplace */ + ignore_times++; + + flist = cur_flist; + cur_flist = flist_for_ndx(ndx); + + file = cur_flist->files[ndx - cur_flist->ndx_start]; + if (solo_file) + strlcpy(fbuf, solo_file, sizeof fbuf); + else + f_name(file, fbuf); + recv_generator(fbuf, file, ndx, itemizing, code, sock_f_out); + cur_flist->to_redo--; + + cur_flist = flist; + + csum_length = SHORT_SUM_LENGTH; + max_size = -max_size; + min_size = -min_size; + ignore_existing = -ignore_existing; + ignore_non_existing = -ignore_non_existing; + update_only = -update_only; + always_checksum = -always_checksum; + size_only = -size_only; + append_mode = -append_mode; + make_backups = -make_backups; + ignore_times--; + continue; + } + + if (cur_flist == first_flist) + break; + + /* We only get here if inc_recurse is enabled. */ if (first_flist->in_progress || first_flist->to_redo) break;