* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-2007 Wayne Davison
+ * Copyright (C) 2003-2008 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
extern int do_xfers;
extern int stdout_format_has_i;
extern int logfile_format_has_i;
+extern int receiver_symlink_times;
extern int am_root;
extern int am_server;
extern int am_daemon;
extern int preserve_devices;
extern int preserve_specials;
extern int preserve_hard_links;
+extern int preserve_executability;
extern int preserve_perms;
extern int preserve_times;
extern int uid_ndx;
static const char *solo_file = NULL;
/* For calling delete_item() and delete_dir_contents(). */
-#define DEL_OWNED_BY_US (1<<0) /* file/dir has our uid */
+#define DEL_NO_UID_WRITE (1<<0) /* file/dir has our uid w/o write perm */
#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 */
};
/* Forward declaration for delete_item(). */
-static enum delret delete_dir_contents(char *fname, int flags);
+static enum delret delete_dir_contents(char *fname, uint16 flags);
static int is_backup_file(char *fn)
{
* 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, int flags)
+static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
{
enum delret ret;
char *what;
if (verbose > 2) {
rprintf(FINFO, "delete_item(%s) mode=%o flags=%d\n",
- fbuf, mode, flags);
+ fbuf, (int)mode, (int)flags);
}
- if (!am_root && !(mode & S_IWUSR) && flags & DEL_OWNED_BY_US)
- do_chmod(fbuf, mode |= S_IWUSR);
+ if (flags & DEL_NO_UID_WRITE)
+ do_chmod(fbuf, mode | S_IWUSR);
if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) {
+ int save_uid_ndx = uid_ndx;
+ /* This only happens on the first call to delete_item() since
+ * delete_dir_contents() always calls us w/DEL_DIR_IS_EMPTY. */
+ if (!uid_ndx)
+ uid_ndx = ++file_extra_cnt;
ignore_perishable = 1;
/* If DEL_RECURSE is not set, this just reports emptiness. */
ret = delete_dir_contents(fbuf, flags);
ignore_perishable = 0;
+ if (!save_uid_ndx) {
+ --file_extra_cnt;
+ uid_ndx = 0;
+ }
if (ret == DR_NOT_EMPTY || ret == DR_AT_LIMIT)
goto check_ret;
/* OK: try to delete the directory. */
* DR_NOT_EMPTY. Note that fname must point to a MAXPATHLEN buffer! (The
* buffer is used for recursion, but returned unchanged.)
*/
-static enum delret delete_dir_contents(char *fname, int flags)
+static enum delret delete_dir_contents(char *fname, uint16 flags)
{
struct file_list *dirlist;
enum delret ret;
remainder = MAXPATHLEN - (p - fname);
/* We do our own recursion, so make delete_item() non-recursive. */
- flags = (flags & ~(DEL_RECURSE|DEL_MAKE_ROOM)) | DEL_DIR_IS_EMPTY;
+ flags = (flags & ~(DEL_RECURSE|DEL_MAKE_ROOM|DEL_NO_UID_WRITE))
+ | DEL_DIR_IS_EMPTY;
for (j = dirlist->used; j--; ) {
struct file_struct *fp = dirlist->files[j];
}
strlcpy(p, fp->basename, remainder);
- if (F_OWNER(fp) == our_uid)
- flags |= DEL_OWNED_BY_US;
- else
- flags &= DEL_OWNED_BY_US;
+ if (!(fp->mode & S_IWUSR) && !am_root && (uid_t)F_OWNER(fp) == our_uid)
+ do_chmod(fname, fp->mode | S_IWUSR);
/* Save stack by recursing to ourself directly. */
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;
}
static int flush_delete_delay(void)
{
+ if (deldelay_fd < 0 && !start_delete_delay_temp())
+ return 0;
if (write(deldelay_fd, deldelay_buf, deldelay_cnt) != deldelay_cnt) {
rsyserr(FERROR, errno, "flush of delete-delay buffer");
delete_during = 0;
- delete_after = 1;
+ delete_after = !inc_recurse;
close(deldelay_fd);
return 0;
}
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;
+ if (deldelay_cnt == deldelay_size && !flush_delete_delay())
+ return 0;
+
+ if (flags & DEL_NO_UID_WRITE)
+ deldelay_buf[deldelay_cnt++] = '!';
+
while (1) {
len = snprintf(deldelay_buf + deldelay_cnt,
deldelay_size - deldelay_cnt,
- "%s%x %s%c",
- plus, (int)file->mode, fname, '\0');
+ "%x %s%c",
+ (int)file->mode, fname, '\0');
if ((deldelay_cnt += len) <= deldelay_size)
break;
- if (deldelay_fd < 0 && !start_delete_delay_temp())
- return 0;
deldelay_cnt -= len;
if (!flush_delete_delay())
return 0;
return 1;
}
-static int read_delay_line(char *buf, int *own_flag_p)
+static int read_delay_line(char *buf, int *flags_p)
{
static int read_pos = 0;
int j, len, mode;
}
bp = deldelay_buf + read_pos;
- if (*bp == '+') {
+ if (*bp == '!') {
bp++;
- *own_flag_p = DEL_OWNED_BY_US;
+ *flags_p = DEL_NO_UID_WRITE;
} else
- *own_flag_p = 0;
+ *flags_p = 0;
if (sscanf(bp, "%x ", &mode) != 1) {
invalid_data:
static void do_delayed_deletions(char *delbuf)
{
- int mode, own_flag;
+ int mode, flags;
if (deldelay_fd >= 0) {
if (deldelay_cnt && !flush_delete_delay())
return;
lseek(deldelay_fd, 0, 0);
}
- while ((mode = read_delay_line(delbuf, &own_flag)) >= 0)
- delete_item(delbuf, mode, own_flag | DEL_RECURSE);
+ while ((mode = read_delay_line(delbuf, &flags)) >= 0)
+ delete_item(delbuf, mode, flags | DEL_RECURSE);
if (deldelay_fd >= 0)
close(deldelay_fd);
}
struct file_list *dirlist;
char delbuf[MAXPATHLEN];
int dlen, i;
+ int save_uid_ndx = uid_ndx;
if (!fbuf) {
change_local_filter_dir(NULL, 0, 0);
return;
}
+ if (!uid_ndx)
+ uid_ndx = ++file_extra_cnt;
+
dirlist = get_dirlist(fbuf, dlen, 0);
/* If an item in dirlist is not found in flist, delete it
continue;
}
if (flist_find(cur_flist, fp) < 0) {
- int flags = DEL_RECURSE
- | (F_OWNER(fp) == our_uid ? DEL_OWNED_BY_US : 0);
+ int flags = DEL_RECURSE;
+ if (!(fp->mode & S_IWUSR) && !am_root && (uid_t)F_OWNER(fp) == our_uid)
+ flags |= DEL_NO_UID_WRITE;
f_name(fp, delbuf);
if (delete_during == 2) {
if (!remember_delete(fp, delbuf, flags))
}
flist_free(dirlist);
+
+ if (!save_uid_ndx) {
+ --file_extra_cnt;
+ uid_ndx = 0;
+ }
}
/* This deletes any files on the receiving side that are not present on the
int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
{
-#ifndef HAVE_LUTIMES
+#if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
if (S_ISLNK(file->mode)) {
;
} else
if (preserve_perms && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
return 0;
+ if (preserve_executability && ((sxp->st.st_mode & 0111 ? 1 : 0) ^ (file->mode & 0111 ? 1 : 0)))
+ return 0;
+
if (am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file))
return 0;
{
if (statret >= 0) { /* A from-dest-dir statret can == 1! */
int keep_time = !preserve_times ? 0
- : S_ISDIR(file->mode) ? preserve_times > 1
- : !S_ISLNK(file->mode);
+ : S_ISDIR(file->mode) ? preserve_times > 1 :
+#if defined HAVE_LUTIMES && defined HAVE_UTIMES
+ (receiver_symlink_times && !(file->flags & FLAG_TIME_FAILED)) ||
+#endif
+ !S_ISLNK(file->mode);
if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size)
iflags |= ITEM_REPORT_SIZE;
;
} else
#endif
- if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
+ if ((preserve_perms || preserve_executability)
+ && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid)
iflags |= ITEM_REPORT_OWNER;
goto try_a_copy;
if (preserve_hard_links && F_IS_HLINKED(file))
finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, j);
- if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
+ if (!maybe_ATTRS_REPORT && (verbose > 1 || stdout_format_has_i > 1)) {
itemize(cmpbuf, file, ndx, 1, sxp,
ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
0, "");
uchar fnamecmp_type;
int implied_dirs_are_missing = relative_paths && !implied_dirs && protocol_version < 30;
int del_opts = delete_mode || force_delete ? DEL_RECURSE : 0;
+ int is_dir = !S_ISDIR(file->mode) ? 0
+ : inc_recurse && ndx != cur_flist->ndx_start - 1 ? -1
+ : 1;
if (verbose > 2)
rprintf(FINFO, "recv_generator(%s,%d)\n", fname, ndx);
if (list_only) {
- if (S_ISDIR(file->mode)
- && ((!implied_dirs && file->flags & FLAG_IMPLIED_DIR)
- || (inc_recurse && ndx != cur_flist->ndx_start - 1)))
+ if (is_dir < 0
+ || (is_dir && !implied_dirs && file->flags & FLAG_IMPLIED_DIR))
return;
list_file_entry(file);
return;
}
if (server_filter_list.head) {
+ int filtered = check_filter(&server_filter_list, fname, is_dir) < 0;
+ if (is_dir < 0 && filtered)
+ return;
if (excluded_below >= 0) {
if (F_DEPTH(file) > excluded_below
&& (!implied_dirs_are_missing || f_name_has_prefix(file, excluded_dir)))
goto skipping;
excluded_below = -1;
}
- if (check_filter(&server_filter_list, fname,
- S_ISDIR(file->mode)) < 0) {
- if (S_ISDIR(file->mode)) {
+ if (filtered) {
+ if (is_dir) {
excluded_below = F_DEPTH(file);
excluded_dir = file;
}
skipping:
- if (verbose) {
- rprintf(FINFO,
- "skipping server-excluded file \"%s\"\n",
- fname);
- }
+ rprintf(FERROR_XFER,
+ "skipping daemon-excluded file \"%s\"\n",
+ fname);
return;
}
}
dry_run--;
missing_below = -1;
} else if (!dry_run) {
- if (S_ISDIR(file->mode))
+ if (is_dir)
file->flags |= FLAG_MISSING_DIR;
return;
}
need_fuzzy_dirlist = 0;
}
- statret = link_stat(fname, &sx.st,
- keep_dirlinks && S_ISDIR(file->mode));
+ statret = link_stat(fname, &sx.st, keep_dirlinks && is_dir);
stat_errno = errno;
}
if (ignore_non_existing > 0 && statret == -1 && stat_errno == ENOENT) {
- if (verbose > 1) {
- rprintf(FINFO, "not creating new %s \"%s\"\n",
- S_ISDIR(file->mode) ? "directory" : "file",
- fname);
- }
- if (S_ISDIR(file->mode)) {
+ if (is_dir) {
+ if (is_dir < 0)
+ return;
if (missing_below < 0) {
if (dry_run)
dry_run++;
}
file->flags |= FLAG_MISSING_DIR;
}
+ if (verbose > 1) {
+ rprintf(FINFO, "not creating new %s \"%s\"\n",
+ is_dir ? "directory" : "file", fname);
+ }
return;
}
- if (statret == 0 && F_OWNER(file) == our_uid)
- del_opts |= DEL_OWNED_BY_US;
+ if (statret == 0 && !(sx.st.st_mode & S_IWUSR)
+ && !am_root && sx.st.st_uid == our_uid)
+ del_opts |= DEL_NO_UID_WRITE;
- if (S_ISDIR(file->mode)) {
+ if (is_dir) {
if (!implied_dirs && file->flags & FLAG_IMPLIED_DIR)
goto cleanup;
- if (inc_recurse && ndx != cur_flist->ndx_start - 1) {
+ if (is_dir < 0) {
/* In inc_recurse mode we want to make sure any missing
* directories get created while we're still processing
* the parent dir (which allows us to touch the parent
fname = f_name(file, NULL);
if (!(file->mode & S_IWUSR))
do_chmod(fname, file->mode);
- if (need_retouch_dir_times)
- set_modtime(fname, file->modtime, file->mode);
+ if (need_retouch_dir_times) {
+ STRUCT_STAT st;
+ if (link_stat(fname, &st, 0) == 0
+ && cmp_time(st.st_mtime, file->modtime) != 0)
+ set_modtime(fname, file->modtime, file->mode);
+ }
if (allowed_lull && !(counter % lull_mod))
maybe_send_keepalive();
else if (!(counter & 0xFF))
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff