* 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
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 uid_t our_uid;
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 filter_rule_list filter_list, daemon_filter_list;
int maybe_ATTRS_REPORT = 0;
enum logcode code, int f_out);
#endif
+#define EARLY_DELAY_DONE_MSG() (!delay_updates)
+#define EARLY_DELETE_DONE_MSG() (!(delete_during == 2 || delete_after))
+
static int start_delete_delay_temp(void)
{
char fnametmp[MAXPATHLEN];
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);
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)))
F_SYMLINK(f));
} else
#endif
- {
+ 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));
&& 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 (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. */
}
} while ((cur_flist = cur_flist->next) != NULL);
- if (read_batch && inc_recurse)
- write_ndx(f_out, NDX_DONE);
-
if (delete_during)
delete_in_dir(NULL, NULL, &dev_zero);
phase++;
rprintf(FINFO, "generate_files phase=%d\n", phase);
write_ndx(f_out, NDX_DONE);
- write_del_stats(f_out);
/* 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 && skipped_deletes) {
rprintf(FWARNING,
"Deletions stopped due to --max-delete limit (%d skipped)\n",
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");
}