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;
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 */
+#define DEL_FOR_FILE (1<<3) /* making room for a replacement file */
+#define DEL_FOR_DIR (1<<4) /* making room for a replacement dir */
+#define DEL_FOR_SYMLINK (1<<5) /* making room for a replacement symlink */
+#define DEL_FOR_DEVICE (1<<6) /* making room for a replacement device */
+#define DEL_FOR_SPECIAL (1<<7) /* making room for a replacement special */
+
+#define DEL_MAKE_ROOM (DEL_FOR_FILE|DEL_FOR_DIR|DEL_FOR_SYMLINK|DEL_FOR_DEVICE|DEL_FOR_SPECIAL)
enum nonregtype {
TYPE_DIR, TYPE_SPECIAL, TYPE_DEVICE, TYPE_SYMLINK
/* Forward declaration for delete_item(). */
static enum delret delete_dir_contents(char *fname, int flags);
-
static int is_backup_file(char *fn)
{
int k = strlen(fn) - backup_suffix_len;
* Note that fbuf must point to a MAXPATHLEN buffer if the mode indicates it's
* a directory! (The buffer is used for recursion, but returned unchanged.)
*/
-static enum delret delete_item(char *fbuf, int mode, char *replace, int flags)
+static enum delret delete_item(char *fbuf, int mode, int flags)
{
enum delret ret;
char *what;
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. */
/* OK: try to delete the directory. */
}
- if (!replace && max_delete >= 0 && ++deletion_count > max_delete)
+ if (!(flags & DEL_MAKE_ROOM) && max_delete >= 0 && ++deletion_count > max_delete)
return DR_AT_LIMIT;
if (S_ISDIR(mode)) {
}
if (ok) {
- if (!replace)
+ if (!(flags & DEL_MAKE_ROOM))
log_delete(fbuf, mode);
ret = DR_SUCCESS;
} else {
}
check_ret:
- if (replace && ret != DR_SUCCESS) {
+ if (ret != DR_SUCCESS && flags & DEL_MAKE_ROOM) {
+ const char *desc;
+ switch (flags & DEL_MAKE_ROOM) {
+ case DEL_FOR_FILE: desc = "regular file"; break;
+ case DEL_FOR_DIR: desc = "directory"; break;
+ case DEL_FOR_SYMLINK: desc = "symlink"; break;
+ case DEL_FOR_DEVICE: desc = "device file"; break;
+ case DEL_FOR_SPECIAL: desc = "special file"; break;
+ default: exit_cleanup(RERR_UNSUPPORTED); /* IMPOSSIBLE */
+ }
rprintf(FERROR_XFER, "could not make way for new %s: %s\n",
- replace, fbuf);
+ desc, fbuf);
}
return ret;
}
remainder = MAXPATHLEN - (p - fname);
/* We do our own recursion, so make delete_item() non-recursive. */
- flags = (flags & ~DEL_RECURSE) | DEL_DIR_IS_EMPTY;
+ flags = (flags & ~(DEL_RECURSE|DEL_MAKE_ROOM)) | DEL_DIR_IS_EMPTY;
for (j = dirlist->used; j--; ) {
struct file_struct *fp = dirlist->files[j];
}
strlcpy(p, fp->basename, remainder);
+ if (!uid_ndx || (uid_t)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 (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS)
+ 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, flags) != DR_SUCCESS)
ret = DR_NOT_EMPTY;
}
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())
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;
}
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:
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, own_flag | DEL_RECURSE);
if (deldelay_fd >= 0)
close(deldelay_fd);
}
continue;
}
if (flist_find(cur_flist, fp) < 0) {
+ int flags = DEL_RECURSE
+ | (!uid_ndx || (uid_t)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, flags);
}
}
return;
}
+ if (statret == 0 && sx.st.st_uid == our_uid)
+ del_opts |= DEL_OWNED_BY_US;
+
if (S_ISDIR(file->mode)) {
if (!implied_dirs && file->flags & FLAG_IMPLIED_DIR)
goto cleanup;
* full later (right before we handle its contents). */
if (statret == 0
&& (S_ISDIR(sx.st.st_mode)
- || delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0))
+ || delete_item(fname, sx.st.st_mode, del_opts | DEL_FOR_DIR) != 0))
goto cleanup; /* Any errors get reported later. */
if (do_mkdir(fname, file->mode & 0700) == 0)
file->flags |= FLAG_DIR_CREATED;
* we need to delete it. If it doesn't exist, then
* (perhaps recursively) create it. */
if (statret == 0 && !S_ISDIR(sx.st.st_mode)) {
- if (delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0)
+ if (delete_item(fname, sx.st.st_mode, del_opts | DEL_FOR_DIR) != 0)
goto skipping_dir_contents;
statret = -1;
}
}
/* Not the right symlink (or not a symlink), so
* delete it. */
- if (delete_item(fname, sx.st.st_mode, "symlink", del_opts) != 0)
+ if (delete_item(fname, sx.st.st_mode, del_opts | DEL_FOR_SYMLINK) != 0)
goto cleanup;
} else if (basis_dir[0] != NULL) {
int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
uint32 *devp = F_RDEV_P(file);
dev_t rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
if (statret == 0) {
- char *t;
+ int del_for_flag;
if (IS_DEVICE(file->mode)) {
if (!IS_DEVICE(sx.st.st_mode))
statret = -1;
- t = "device file";
+ del_for_flag = DEL_FOR_DEVICE;
} else {
if (!IS_SPECIAL(sx.st.st_mode))
statret = -1;
- t = "special file";
+ del_for_flag = DEL_FOR_SPECIAL;
}
if (statret == 0
&& BITS_EQUAL(sx.st.st_mode, file->mode, _S_IFMT)
goto return_with_success;
goto cleanup;
}
- if (delete_item(fname, sx.st.st_mode, t, del_opts) != 0)
+ if (delete_item(fname, sx.st.st_mode, del_opts | del_for_flag) != 0)
goto cleanup;
} else if (basis_dir[0] != NULL) {
int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
fnamecmp_type = FNAMECMP_FNAME;
if (statret == 0 && !S_ISREG(sx.st.st_mode)) {
- if (delete_item(fname, sx.st.st_mode, "regular file", del_opts) != 0)
+ if (delete_item(fname, sx.st.st_mode, del_opts | DEL_FOR_FILE) != 0)
goto cleanup;
statret = -1;
stat_errno = ENOENT;
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff