* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-2008 Wayne Davison
+ * Copyright (C) 2003-2009 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
*/
#include "rsync.h"
+#include "inums.h"
+#include "ifuncs.h"
extern int dry_run;
extern int do_xfers;
extern int delete_before;
extern int delete_during;
extern int delete_after;
+extern int missing_args;
extern int msgdone_cnt;
extern int ignore_errors;
extern int remove_source_files;
extern int delay_updates;
extern int update_only;
+extern int human_readable;
extern int ignore_existing;
extern int ignore_non_existing;
extern int inplace;
extern int always_checksum;
extern int checksum_len;
extern char *partial_dir;
-extern char *basis_dir[];
extern int compare_dest;
extern int copy_dest;
extern int link_dest;
extern int max_delete;
extern int force_delete;
extern int one_file_system;
+extern int skipped_deletes;
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;
+extern char *basis_dir[MAX_BASIS_DIRS+1];
extern struct file_list *cur_flist, *first_flist, *dir_flist;
-extern struct filter_list_struct daemon_filter_list;
+extern struct filter_list_struct filter_list, daemon_filter_list;
-int ignore_perishable = 0;
-int non_perishable_cnt = 0;
int maybe_ATTRS_REPORT = 0;
static dev_t dev_zero;
-static int deletion_count = 0; /* used to implement --max-delete */
static int deldelay_size = 0, deldelay_cnt = 0;
static char *deldelay_buf = NULL;
static int deldelay_fd = -1;
static int need_retouch_dir_perms;
static const char *solo_file = NULL;
-/* For calling delete_item() and delete_dir_contents(). */
-#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 */
-#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
};
-enum delret {
- DR_SUCCESS = 0, DR_FAILURE, DR_AT_LIMIT, DR_NOT_EMPTY
-};
-
/* Forward declarations. */
-static enum delret delete_dir_contents(char *fname, uint16 flags);
#ifdef SUPPORT_HARD_LINKS
static void handle_skipped_hlink(struct file_struct *file, int itemizing,
enum logcode code, int f_out);
#endif
-static int is_backup_file(char *fn)
-{
- int k = strlen(fn) - backup_suffix_len;
- return k > 0 && strcmp(fn+k, backup_suffix) == 0;
-}
-
-/* Delete a file or directory. If DEL_RECURSE is set in the flags, this will
- * delete recursively.
- *
- * 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, uint16 mode, uint16 flags)
-{
- enum delret ret;
- char *what;
- int ok;
-
- if (DEBUG_GTE(DEL, 2)) {
- rprintf(FINFO, "delete_item(%s) mode=%o flags=%d\n",
- fbuf, (int)mode, (int)flags);
- }
-
- 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. */
- }
-
- if (!(flags & DEL_MAKE_ROOM) && max_delete >= 0 && ++deletion_count > max_delete)
- return DR_AT_LIMIT;
-
- if (S_ISDIR(mode)) {
- what = "rmdir";
- ok = do_rmdir(fbuf) == 0;
- } else if (make_backups > 0 && (backup_dir || !is_backup_file(fbuf))) {
- what = "make_backup";
- ok = make_backup(fbuf);
- } else {
- what = "unlink";
- ok = robust_unlink(fbuf) == 0;
- }
-
- if (ok) {
- if (!(flags & DEL_MAKE_ROOM))
- log_delete(fbuf, mode);
- ret = DR_SUCCESS;
- } else {
- if (S_ISDIR(mode) && errno == ENOTEMPTY) {
- rprintf(FINFO, "cannot delete non-empty directory: %s\n",
- fbuf);
- ret = DR_NOT_EMPTY;
- } else if (errno != ENOENT) {
- rsyserr(FERROR, errno, "delete_file: %s(%s) failed",
- what, fbuf);
- ret = DR_FAILURE;
- } else {
- deletion_count--;
- ret = DR_SUCCESS;
- }
- }
-
- check_ret:
- 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",
- desc, fbuf);
- }
- return ret;
-}
-
-/* The directory is about to be deleted: if DEL_RECURSE is given, delete all
- * its contents, otherwise just checks for content. Returns DR_SUCCESS or
- * 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, uint16 flags)
-{
- struct file_list *dirlist;
- enum delret ret;
- unsigned remainder;
- void *save_filters;
- int j, dlen;
- char *p;
-
- if (DEBUG_GTE(DEL, 3)) {
- rprintf(FINFO, "delete_dir_contents(%s) flags=%d\n",
- fname, flags);
- }
-
- dlen = strlen(fname);
- save_filters = push_local_filters(fname, dlen);
-
- non_perishable_cnt = 0;
- dirlist = get_dirlist(fname, dlen, 0);
- ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS;
-
- if (!dirlist->used)
- goto done;
-
- if (!(flags & DEL_RECURSE)) {
- ret = DR_NOT_EMPTY;
- goto done;
- }
-
- p = fname + dlen;
- if (dlen != 1 || *fname != '/')
- *p++ = '/';
- remainder = MAXPATHLEN - (p - fname);
-
- /* We do our own recursion, so make delete_item() non-recursive. */
- 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];
-
- if (fp->flags & FLAG_MOUNT_DIR && S_ISDIR(fp->mode)) {
- if (DEBUG_GTE(DEL, 1)) {
- rprintf(FINFO,
- "mount point, %s, pins parent directory\n",
- f_name(fp, NULL));
- }
- ret = DR_NOT_EMPTY;
- continue;
- }
-
- strlcpy(p, fp->basename, remainder);
- 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 (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;
- }
-
- fname[dlen] = '\0';
-
- done:
- flist_free(dirlist);
- pop_local_filters(save_filters);
-
- if (ret == DR_NOT_EMPTY) {
- rprintf(FINFO, "cannot delete non-empty directory: %s\n",
- fname);
- }
- return ret;
-}
+#define EARLY_DELAY_DONE_MSG() (!delay_updates)
+#define EARLY_DELETE_DONE_MSG() (!(delete_during == 2 || delete_after))
static int start_delete_delay_temp(void)
{
f_name(fp, NULL));
continue;
}
- if (flist_find(cur_flist, fp) < 0) {
+ /* Here we want to match regardless of file type. Replacement
+ * of a file with one of another type is handled separately by
+ * a delete_item call with a DEL_MAKE_ROOM flag. */
+ if (flist_find_ignore_dirness(cur_flist, fp) < 0) {
int flags = DEL_RECURSE;
if (!(fp->mode & S_IWUSR) && !am_root && (uid_t)F_OWNER(fp) == our_uid)
flags |= DEL_NO_UID_WRITE;
if (iflags & ITEM_XNAME_FOLLOWS)
write_vstring(sock_f_out, xname, strlen(xname));
#ifdef SUPPORT_XATTRS
- if (preserve_xattrs && !dry_run
+ if (preserve_xattrs && do_xfers
&& iflags & (ITEM_REPORT_XATTR|ITEM_TRANSFER)) {
send_xattr_request(NULL, file,
iflags & ITEM_REPORT_XATTR ? sock_f_out : -1);
if ((int64)sum->count != l)
sum->count = -1;
- if (sum->count && DEBUG_GTE(CHKSUM, 2)) {
+ if (sum->count && DEBUG_GTE(DELTASUM, 2)) {
rprintf(FINFO,
"count=%s rem=%ld blength=%ld s2length=%d flength=%s\n",
- big_num(sum->count, 0), (long)sum->remainder, (long)sum->blength,
- sum->s2length, big_num(sum->flength, 0));
+ big_num(sum->count), (long)sum->remainder, (long)sum->blength,
+ sum->s2length, big_num(sum->flength));
}
}
sum1 = get_checksum1(map, n1);
get_checksum2(map, n1, sum2);
- if (DEBUG_GTE(CHKSUM, 3)) {
+ if (DEBUG_GTE(DELTASUM, 3)) {
rprintf(FINFO,
"chunk[%s] offset=%s len=%ld sum1=%08lx\n",
- big_num(i, 0), big_num(offset - n1, 0), (long)n1,
+ big_num(i), big_num(offset - n1), (long)n1,
(unsigned long)sum1);
}
write_int(f_out, sum1);
copy_to = buf;
}
cleanup_set(copy_to, NULL, NULL, -1, -1);
- if (copy_file(src, copy_to, fd_w, file->mode, 0) < 0) {
+ if (copy_file(src, copy_to, fd_w, file->mode) < 0) {
if (INFO_GTE(COPY, 1)) {
rsyserr(FINFO, errno, "copy_file %s => %s",
full_fname(src), copy_to);
}
switch (type) {
case TYPE_DIR:
- break;
case TYPE_SPECIAL:
+ break;
case TYPE_DEVICE:
devp = F_RDEV_P(file);
if (sxp->st.st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)))
{
char permbuf[PERMSTRING_SIZE];
int64 len;
+ int colwidth = human_readable ? 14 : 11;
if (!F_IS_ACTIVE(f)) {
/* this can happen if duplicate names were removed */
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
- rprintf(FINFO, "%s %11s %s %s -> %s\n",
- permbuf, big_num(len, 0), timestring(f->modtime),
- f_name(f, NULL), F_SYMLINK(f));
+ rprintf(FINFO, "%s %*s %s %s -> %s\n",
+ permbuf, colwidth, comma_num(len),
+ timestring(f->modtime), f_name(f, NULL),
+ F_SYMLINK(f));
} else
#endif
- {
- rprintf(FINFO, "%s %11s %s %s\n",
- permbuf, big_num(len, 0), timestring(f->modtime),
+ if (missing_args == 2 && f->mode == 0) {
+ rprintf(FINFO, "%-*s %s\n",
+ colwidth + 31, "*missing",
f_name(f, NULL));
+ } else {
+ rprintf(FINFO, "%s %*s %s %s\n",
+ permbuf, colwidth, comma_num(len),
+ timestring(f->modtime), f_name(f, NULL));
}
}
}
}
-#ifdef SUPPORT_ACLS
- sx.acc_acl = sx.def_acl = NULL;
-#endif
-#ifdef SUPPORT_XATTRS
- sx.xattr = NULL;
-#endif
+ init_stat_x(&sx);
if (dry_run > 1 || (dry_missing_dir && is_below(file, dry_missing_dir))) {
parent_is_dry_missing:
if (fuzzy_dirlist) {
&& do_stat(dn, &sx.st) < 0) {
if (dry_run)
goto parent_is_dry_missing;
- if (create_directory_path(fname) < 0) {
+ if (make_path(fname, MKP_DROP_NAME | MKP_SKIP_SLASH) < 0) {
rsyserr(FERROR_XFER, errno,
"recv_generator: mkdir %s failed",
full_fname(dn));
stat_errno = errno;
}
+ if (missing_args == 2 && file->mode == 0) {
+ if (filter_list.head && check_filter(&filter_list, FINFO, fname, is_dir) < 0)
+ return;
+ if (statret == 0)
+ delete_item(fname, sx.st.st_mode, del_opts);
+ return;
+ }
+
if (ignore_non_existing > 0 && statret == -1 && stat_errno == ENOENT) {
if (is_dir) {
if (is_dir < 0)
}
if (real_ret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
if (!relative_paths || errno != ENOENT
- || create_directory_path(fname) < 0
- || (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) {
+ || make_path(fname, MKP_DROP_NAME | MKP_SKIP_SLASH) < 0
+ || (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) {
rsyserr(FERROR_XFER, errno,
"recv_generator: mkdir %s failed",
full_fname(fname));
if ((am_root && preserve_devices && IS_DEVICE(file->mode))
|| (preserve_specials && IS_SPECIAL(file->mode))) {
- uint32 *devp = F_RDEV_P(file);
- dev_t rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
+ dev_t rdev;
+ if (IS_DEVICE(file->mode)) {
+ uint32 *devp = F_RDEV_P(file);
+ rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
+ } else
+ rdev = 0;
if (statret == 0) {
int del_for_flag;
if (IS_DEVICE(file->mode)) {
}
if (statret == 0
&& BITS_EQUAL(sx.st.st_mode, file->mode, _S_IFMT)
- && sx.st.st_rdev == rdev) {
+ && (IS_SPECIAL(sx.st.st_mode) || sx.st.st_rdev == rdev)) {
/* The device or special file is identical. */
set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT);
if (itemizing)
goto cleanup;
if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
goto pretend_missing;
- if (copy_file(fname, backupptr, -1, back_file->mode, 1) < 0) {
+ if (copy_file(fname, backupptr, -1, back_file->mode) < 0) {
unmake_file(back_file);
back_file = NULL;
goto cleanup;
goto cleanup;
}
if ((f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
- int save_errno = errno ? errno : EINVAL; /* 0 paranoia */
- if (errno == ENOENT && make_bak_dir(backupptr) == 0) {
- if ((f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0)
- save_errno = errno ? errno : save_errno;
- else
- save_errno = 0;
- }
- if (save_errno) {
- rsyserr(FERROR_XFER, save_errno, "open %s", full_fname(backupptr));
- unmake_file(back_file);
- back_file = NULL;
- close(fd);
- goto cleanup;
- }
+ rsyserr(FERROR_XFER, errno, "open %s", full_fname(backupptr));
+ unmake_file(back_file);
+ back_file = NULL;
+ close(fd);
+ goto cleanup;
}
fnamecmp_type = FNAMECMP_BACKUP;
}
- if (DEBUG_GTE(CHKSUM, 3)) {
+ if (DEBUG_GTE(DELTASUM, 3)) {
rprintf(FINFO, "gen mapped %s of size %s\n",
- fnamecmp, big_num(sx.st.st_size, 0));
+ fnamecmp, big_num(sx.st.st_size));
}
- if (DEBUG_GTE(CHKSUM, 2))
+ if (DEBUG_GTE(DELTASUM, 2))
rprintf(FINFO, "generating and sending sums for %d\n", ndx);
notify_others:
while (1) {
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && (ndx = get_hlink_num()) != -1) {
- flist = flist_for_ndx(ndx);
- assert(flist != NULL);
+ flist = flist_for_ndx(ndx, "check_for_finished_files.1");
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);
ignore_times++;
flist = cur_flist;
- cur_flist = flist_for_ndx(ndx);
+ cur_flist = flist_for_ndx(ndx, "check_for_finished_files.2");
file = cur_flist->files[ndx - cur_flist->ndx_start];
if (solo_file)
if (first_flist->in_progress || first_flist->to_redo)
break;
- if (!read_batch) {
- write_ndx(sock_f_out, NDX_DONE);
+ write_ndx(sock_f_out, NDX_DONE);
+ if (!read_batch)
maybe_flush_socket(1);
- }
if (delete_during == 2 || !dir_tweaking) {
/* Skip directory touch-up. */
rprintf(FINFO, "generate_files phase=%d\n", phase);
write_ndx(f_out, NDX_DONE);
+
/* Reduce round-trip lag-time for a useless delay-updates phase. */
- if (protocol_version >= 29 && !delay_updates)
+ if (protocol_version >= 29 && EARLY_DELAY_DONE_MSG())
write_ndx(f_out, NDX_DONE);
+ if (protocol_version >= 31 && EARLY_DELETE_DONE_MSG()) {
+ if ((INFO_GTE(STATS, 2) && (delete_mode || force_delete)) || read_batch)
+ write_del_stats(f_out);
+ if (EARLY_DELAY_DONE_MSG()) /* Can't send this before delay */
+ write_ndx(f_out, NDX_DONE);
+ }
+
/* Read MSG_DONE for the redo phase (and any prior messages). */
while (1) {
check_for_finished_files(itemizing, code, 0);
phase++;
if (DEBUG_GTE(GENR, 1))
rprintf(FINFO, "generate_files phase=%d\n", phase);
- if (delay_updates)
+ if (!EARLY_DELAY_DONE_MSG()) {
write_ndx(f_out, NDX_DONE);
+ if (protocol_version >= 31 && EARLY_DELETE_DONE_MSG())
+ write_ndx(f_out, NDX_DONE);
+ }
/* Read MSG_DONE for delay-updates phase & prior messages. */
while (msgdone_cnt == 2)
wait_for_receiver();
if (delete_after && !solo_file && file_total > 0)
do_delete_pass();
- if ((need_retouch_dir_perms || need_retouch_dir_times)
- && dir_tweaking && (!inc_recurse || delete_during == 2))
- touch_up_dirs(dir_flist, -1);
-
- if (max_delete >= 0 && deletion_count > max_delete) {
- rprintf(FINFO,
+ if (max_delete >= 0 && skipped_deletes) {
+ rprintf(FWARNING,
"Deletions stopped due to --max-delete limit (%d skipped)\n",
- deletion_count - max_delete);
+ skipped_deletes);
io_error |= IOERR_DEL_LIMIT;
}
+ if (protocol_version >= 31) {
+ if (!EARLY_DELETE_DONE_MSG()) {
+ if (INFO_GTE(STATS, 2) || read_batch)
+ write_del_stats(f_out);
+ write_ndx(f_out, NDX_DONE);
+ }
+
+ /* Read MSG_DONE for late-delete phase & prior messages. */
+ while (msgdone_cnt == 3)
+ wait_for_receiver();
+ }
+
+ if ((need_retouch_dir_perms || need_retouch_dir_times)
+ && dir_tweaking && (!inc_recurse || delete_during == 2))
+ touch_up_dirs(dir_flist, -1);
+
if (DEBUG_GTE(GENR, 1))
rprintf(FINFO, "generate_files finished\n");
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff