extern int link_dest;
extern int whole_file;
extern int list_only;
+extern int new_root_dir;
extern int read_batch;
extern int safe_symlinks;
extern long block_size; /* "long" because popt can't set an int32. */
extern struct file_list *the_file_list;
extern struct filter_list_struct server_filter_list;
+int ignore_perishable = 0;
+int non_perishable_cnt = 0;
+
static int deletion_count = 0; /* used to implement --max-delete */
-/* For calling delete_file() */
-#define DEL_FORCE_RECURSE (1<<1) /* recurse even w/o --force */
-#define DEL_TERSE (1<<3)
+/* For calling delete_item() and delete_dir_contents(). */
+#define DEL_RECURSE (1<<1) /* recurse */
+#define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */
+
+enum nonregtype {
+ TYPE_DIR, TYPE_SPECIAL, TYPE_DEVICE, TYPE_SYMLINK
+};
+
+enum delret {
+ DR_SUCCESS = 0, DR_FAILURE, DR_AT_LIMIT, DR_NOT_EMPTY
+};
+
+/* Forward declaration for delete_item(). */
+static enum delret delete_dir_contents(char *fname, int flags);
static int is_backup_file(char *fn)
return k > 0 && strcmp(fn+k, backup_suffix) == 0;
}
-
-/* Delete a file or directory. If DEL_FORCE_RECURSE is set in the flags, or if
- * force_delete is set, this will delete recursively.
+/* Delete a file or directory. If DEL_RECURSE is set in the flags, this will
+ * delete recursively.
*
* Note that fname must point to a MAXPATHLEN buffer if the mode indicates it's
* a directory! (The buffer is used for recursion, but returned unchanged.)
*/
-static int delete_item(char *fname, int mode, int flags)
+static enum delret delete_item(char *fname, int mode, char *replace, int flags)
{
- struct file_list *dirlist;
- int j, dlen, zap_dir, ok;
- unsigned remainder;
- void *save_filters;
- char *p;
+ enum delret ret;
+ char *what;
+ int ok;
- if (!S_ISDIR(mode)) {
- if (max_delete && ++deletion_count > max_delete)
- return 0;
- if (make_backups && (backup_dir || !is_backup_file(fname)))
- ok = make_backup(fname);
- else
- ok = robust_unlink(fname) == 0;
- if (ok) {
- if (!(flags & DEL_TERSE))
- log_delete(fname, mode);
- return 0;
- }
- if (errno == ENOENT) {
- deletion_count--;
- return 0;
- }
- rsyserr(FERROR, errno, "delete_file: unlink %s failed",
- full_fname(fname));
- return -1;
+ if (verbose > 2) {
+ rprintf(FINFO, "delete_item(%s) mode=%o flags=%d\n",
+ fname, mode, flags);
}
- zap_dir = flags & DEL_FORCE_RECURSE || force_delete;
- if ((max_delete && ++deletion_count > max_delete)
- || (dry_run && zap_dir)) {
- ok = 0;
- errno = ENOTEMPTY;
- } else if (make_backups && !backup_dir && !is_backup_file(fname)
- && !(flags & DEL_FORCE_RECURSE))
- ok = make_backup(fname);
- else
+ if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) {
+ ignore_perishable = 1;
+ /* If DEL_RECURSE is not set, this just reports emptiness. */
+ ret = delete_dir_contents(fname, flags);
+ ignore_perishable = 0;
+ if (ret == DR_NOT_EMPTY || ret == DR_AT_LIMIT)
+ goto check_ret;
+ /* OK: try to delete the directory. */
+ }
+
+ if (!replace && max_delete >= 0 && ++deletion_count > max_delete)
+ return DR_AT_LIMIT;
+
+ if (S_ISDIR(mode)) {
+ what = "rmdir";
ok = do_rmdir(fname) == 0;
+ } else if (make_backups && (backup_dir || !is_backup_file(fname))) {
+ what = "make_backup";
+ ok = make_backup(fname);
+ } else {
+ what = "unlink";
+ ok = robust_unlink(fname) == 0;
+ }
+
if (ok) {
- if (!(flags & DEL_TERSE))
+ if (!replace)
log_delete(fname, mode);
- return 0;
+ ret = DR_SUCCESS;
+ } else {
+ if (S_ISDIR(mode) && errno == ENOTEMPTY) {
+ rprintf(FINFO, "cannot delete non-empty directory: %s\n",
+ fname);
+ ret = DR_NOT_EMPTY;
+ } else if (errno != ENOENT) {
+ rsyserr(FERROR, errno, "delete_file: %s(%s) failed",
+ what, full_fname(fname));
+ ret = DR_FAILURE;
+ } else {
+ deletion_count--;
+ ret = DR_SUCCESS;
+ }
}
- if (errno == ENOENT) {
- deletion_count--;
- return 0;
+
+ check_ret:
+ if (replace && ret != DR_SUCCESS) {
+ rprintf(FERROR, "could not make way for new %s: %s\n",
+ replace, fname);
}
- if (!zap_dir) {
- rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
- full_fname(fname));
- return -1;
+ 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, int flags)
+{
+ struct file_list *dirlist;
+ enum delret ret;
+ unsigned remainder;
+ void *save_filters;
+ int j, dlen;
+ char *p;
+
+ if (verbose > 3) {
+ rprintf(FINFO, "delete_dir_contents(%s) flags=%d\n",
+ fname, flags);
}
- flags |= DEL_FORCE_RECURSE; /* mark subdir dels as not "in the way" */
- deletion_count--;
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->count)
+ 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_DIR_IS_EMPTY;
+
for (j = dirlist->count; j--; ) {
struct file_struct *fp = dirlist->files[j];
- if (fp->flags & FLAG_MOUNT_POINT)
+ if (fp->flags & FLAG_MOUNT_POINT) {
+ if (verbose > 1) {
+ rprintf(FINFO,
+ "mount point, %s, pins parent directory\n",
+ f_name(fp, NULL));
+ }
+ ret = DR_NOT_EMPTY;
continue;
+ }
strlcpy(p, fp->basename, remainder);
- delete_item(fname, fp->mode, flags & ~DEL_TERSE);
+ /* 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)
+ ret = DR_NOT_EMPTY;
}
- flist_free(dirlist);
fname[dlen] = '\0';
+ done:
+ flist_free(dirlist);
pop_local_filters(save_filters);
- if (max_delete && ++deletion_count > max_delete)
- return 0;
-
- if (do_rmdir(fname) == 0) {
- if (!(flags & DEL_TERSE))
- log_delete(fname, mode);
- } else if (errno != ENOTEMPTY && errno != EEXIST && errno != ENOENT) {
- rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
- full_fname(fname));
- return -1;
+ if (ret == DR_NOT_EMPTY) {
+ rprintf(FINFO, "cannot delete non-empty directory: %s\n",
+ fname);
}
-
- return 0;
+ return ret;
}
* from the filesystem. */
for (i = dirlist->count; i--; ) {
struct file_struct *fp = dirlist->files[i];
- if (!fp->basename || fp->flags & FLAG_MOUNT_POINT)
+ if (!fp->basename)
+ continue;
+ if (fp->flags & FLAG_MOUNT_POINT) {
+ if (verbose > 1)
+ rprintf(FINFO, "cannot delete mount point: %s\n",
+ f_name(fp, NULL));
continue;
+ }
if (flist_find(flist, fp) < 0) {
f_name(fp, delbuf);
- delete_item(delbuf, fp->mode, DEL_FORCE_RECURSE);
+ delete_item(delbuf, fp->mode, NULL, DEL_RECURSE);
}
}
}
void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
- int32 iflags, uchar fnamecmp_type, char *xname)
+ int32 iflags, uchar fnamecmp_type, const char *xname)
{
if (statret >= 0) { /* A from-dest-dir statret can == 1! */
int keep_time = !preserve_times ? 0
if (S_ISREG(file->mode) && file->length != st->st_size)
iflags |= ITEM_REPORT_SIZE;
if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
- && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
- || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
+ && !(iflags & ITEM_MATCHED)
+ && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
+ || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
iflags |= ITEM_REPORT_TIME;
if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
int64 l;
int b = BLOCKSUM_BIAS;
for (l = len; l >>= 1; b += 2) {}
- for (c = blength; c >>= 1 && b; b--) {}
+ for (c = blength; (c >>= 1) && b; b--) {}
/* add a bit, subtract rollsum, round up. */
s2length = (b + 1 - 32 + 7) / 8; /* --optimize in compiler-- */
s2length = MAX(s2length, csum_length);
sum->flength = len;
sum->blength = blength;
sum->s2length = s2length;
- sum->remainder = len % blength;
- sum->count = len / blength + (sum->remainder != 0);
+ sum->remainder = (int32)(len % blength);
+ sum->count = (int32)(len / blength) + (sum->remainder != 0);
if (sum->count && verbose > 2) {
rprintf(FINFO,
char *cmpbuf, STRUCT_STAT *stp, int itemizing,
int maybe_ATTRS_REPORT, enum logcode code)
{
- int save_ignore_times = ignore_times;
int best_match = -1;
int match_level = 0;
int j = 0;
- /* We can't let ignore_times affect the unchanged_file() test in
- * an alternate-dest dir or we will never find any matches. */
- ignore_times = 0;
-
do {
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
if (link_stat(cmpbuf, stp, 0) < 0 || !S_ISREG(stp->st_mode))
break;
} while (basis_dir[++j] != NULL);
- ignore_times = save_ignore_times;
-
if (!match_level)
return -1;
j = best_match;
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
if (link_stat(cmpbuf, stp, 0) < 0)
- match_level = 0;
+ return -1;
}
if (match_level == 3 && !copy_dest) {
#ifdef SUPPORT_HARD_LINKS
if (link_dest) {
+ int i = itemizing && (verbose > 1 || stdout_format_has_i > 1);
if (hard_link_one(file, ndx, fname, 0, stp,
- cmpbuf, 1,
- itemizing && verbose > 1,
- code) < 0)
+ cmpbuf, 1, i, code) < 0)
goto try_a_copy;
- if (preserve_hard_links && file->link_u.links)
+ if (preserve_hard_links && file->link_u.links) {
+ if (dry_run)
+ file->link_u.links->link_dest_used = j + 1;
hard_link_cluster(file, ndx, itemizing, code);
+ }
} else
#endif
if (itemizing)
}
/* This is only called for non-regular files. We return -2 if we've finished
- * handling the file, or -1 if no dest-linking occurred. */
+ * handling the file, or -1 if no dest-linking occurred, or a non-negative
+ * value if we found an alternate basis file. */
static int try_dests_non(struct file_struct *file, char *fname, int ndx,
- int itemizing, int maybe_ATTRS_REPORT,
- enum logcode code)
+ char *cmpbuf, STRUCT_STAT *stp, int itemizing,
+ int maybe_ATTRS_REPORT, enum logcode code)
{
- char fnamebuf[MAXPATHLEN];
- STRUCT_STAT st;
- int i = 0;
+ char lnk[MAXPATHLEN];
+ int best_match = -1;
+ int match_level = 0;
+ enum nonregtype type;
+ int len, j = 0;
+
+#ifndef SUPPORT_LINKS
+ if (S_ISLNK(file->mode))
+ return -1;
+#endif
+ if (S_ISDIR(file->mode)) {
+ type = TYPE_DIR;
+ } else if (IS_SPECIAL(file->mode))
+ type = TYPE_SPECIAL;
+ else if (IS_DEVICE(file->mode))
+ type = TYPE_DEVICE;
+#ifdef SUPPORT_LINKS
+ else if (S_ISLNK(file->mode))
+ type = TYPE_SYMLINK;
+#endif
+ else {
+ rprintf(FERROR,
+ "internal: try_dests_non() called with invalid mode (%o)\n",
+ (int)file->mode);
+ exit_cleanup(RERR_UNSUPPORTED);
+ }
do {
- pathjoin(fnamebuf, MAXPATHLEN, basis_dir[i], fname);
- if (link_stat(fnamebuf, &st, 0) < 0 || S_ISDIR(st.st_mode)
- || !unchanged_attrs(file, &st))
+ pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
+ if (link_stat(cmpbuf, stp, 0) < 0)
continue;
- if (S_ISLNK(file->mode)) {
+ switch (type) {
+ case TYPE_DIR:
+ if (!S_ISDIR(stp->st_mode))
+ continue;
+ break;
+ case TYPE_SPECIAL:
+ if (!IS_SPECIAL(stp->st_mode))
+ continue;
+ break;
+ case TYPE_DEVICE:
+ if (!IS_DEVICE(stp->st_mode))
+ continue;
+ break;
#ifdef SUPPORT_LINKS
- char lnk[MAXPATHLEN];
- int len;
- if ((len = readlink(fnamebuf, lnk, MAXPATHLEN-1)) <= 0)
+ case TYPE_SYMLINK:
+ if (!S_ISLNK(stp->st_mode))
continue;
- lnk[len] = '\0';
- if (strcmp(lnk, file->u.link) != 0)
+ break;
#endif
+ }
+ if (match_level < 1) {
+ match_level = 1;
+ best_match = j;
+ }
+ switch (type) {
+ case TYPE_DIR:
+ break;
+ case TYPE_SPECIAL:
+ case TYPE_DEVICE:
+ if (stp->st_rdev != file->u.rdev)
continue;
- } else if (IS_SPECIAL(file->mode)) {
- if (!IS_SPECIAL(st.st_mode) || st.st_rdev != file->u.rdev)
+ break;
+#ifdef SUPPORT_LINKS
+ case TYPE_SYMLINK:
+ if ((len = readlink(cmpbuf, lnk, MAXPATHLEN-1)) <= 0)
continue;
- } else if (IS_DEVICE(file->mode)) {
- if (!IS_DEVICE(st.st_mode) || st.st_rdev != file->u.rdev)
+ lnk[len] = '\0';
+ if (strcmp(lnk, file->u.link) != 0)
continue;
- } else {
- rprintf(FERROR,
- "internal: try_dests_non() called with invalid mode (%o)\n",
- (int)file->mode);
- exit_cleanup(RERR_UNSUPPORTED);
+ break;
+#endif
+ }
+ if (match_level < 2) {
+ match_level = 2;
+ best_match = j;
}
+ if (unchanged_attrs(file, stp)) {
+ match_level = 3;
+ best_match = j;
+ break;
+ }
+ } while (basis_dir[++j] != NULL);
+
+ if (!match_level)
+ return -1;
+
+ if (j != best_match) {
+ j = best_match;
+ pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
+ if (link_stat(cmpbuf, stp, 0) < 0)
+ return -1;
+ }
+
+ if (match_level == 3) {
#ifdef SUPPORT_HARD_LINKS
if (link_dest
#ifndef CAN_HARDLINK_SYMLINK
#ifndef CAN_HARDLINK_SPECIAL
&& !IS_SPECIAL(file->mode) && !IS_DEVICE(file->mode)
#endif
- ) {
- if (do_link(fnamebuf, fname) < 0) {
+ && !S_ISDIR(file->mode)) {
+ if (do_link(cmpbuf, fname) < 0) {
rsyserr(FERROR, errno,
"failed to hard-link %s with %s",
- fnamebuf, fname);
- break;
+ cmpbuf, fname);
+ return j;
}
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
- }
+ } else
#endif
- if (itemizing && stdout_format_has_i && verbose > 1) {
- int changes = compare_dest ? 0 : ITEM_LOCAL_CHANGE
- + (link_dest ? ITEM_XNAME_FOLLOWS : 0);
- char *lp = link_dest ? "" : NULL;
- itemize(file, ndx, 0, &st, changes, 0, lp);
+ match_level = 2;
+ if (itemizing && stdout_format_has_i
+ && (verbose > 1 || stdout_format_has_i > 1)) {
+ int chg = compare_dest && type != TYPE_DIR ? 0
+ : ITEM_LOCAL_CHANGE
+ + (match_level == 3 ? ITEM_XNAME_FOLLOWS : 0);
+ char *lp = match_level == 3 ? "" : NULL;
+ itemize(file, ndx, 0, stp, chg + ITEM_MATCHED, 0, lp);
}
if (verbose > 1 && maybe_ATTRS_REPORT) {
- rprintf(FCLIENT, "%s is uptodate\n", fname);
+ rprintf(FCLIENT, "%s%s is uptodate\n",
+ fname, type == TYPE_DIR ? "/" : "");
}
return -2;
- } while (basis_dir[++i] != NULL);
+ }
- return -1;
+ return j;
}
static int phase = 0;
enum logcode code, int f_out)
{
static int missing_below = -1, excluded_below = -1;
- static char *parent_dirname = "";
+ static const char *parent_dirname = "";
static struct file_list *fuzzy_dirlist = NULL;
static int need_fuzzy_dirlist = 0;
struct file_struct *fuzzy_file = NULL;
char *fnamecmp, *partialptr, *backupptr = NULL;
char fnamecmpbuf[MAXPATHLEN];
uchar fnamecmp_type;
- int del_opts = DEL_TERSE | (delete_mode ? DEL_FORCE_RECURSE : 0);
+ int del_opts = delete_mode || force_delete ? DEL_RECURSE : 0;
if (list_only)
return;
statret = -1;
stat_errno = ENOENT;
} else {
- char *dn = file->dirname ? file->dirname : ".";
+ const char *dn = file->dirname ? file->dirname : ".";
if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
if (relative_paths && !implied_dirs
- && safe_stat(dn, &st) < 0
+ && do_stat(dn, &st) < 0
&& create_directory_path(fname) < 0) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
parent_dirname = dn;
if (need_fuzzy_dirlist && S_ISREG(file->mode)) {
- fuzzy_dirlist = get_dirlist(dn, -1, 1);
+ strlcpy(fnamecmpbuf, dn, sizeof fnamecmpbuf);
+ fuzzy_dirlist = get_dirlist(fnamecmpbuf, -1, 1);
need_fuzzy_dirlist = 0;
}
* we need to delete it. If it doesn't exist, then
* (perhaps recursively) create it. */
if (statret == 0 && !S_ISDIR(st.st_mode)) {
- if (delete_item(fname, st.st_mode, del_opts) < 0)
+ if (delete_item(fname, st.st_mode, "directory", del_opts) != 0)
return;
statret = -1;
}
missing_below = file->dir.depth;
dry_run++;
}
+ real_ret = statret;
+ real_st = st;
+ if (new_root_dir) {
+ if (*fname == '.' && fname[1] == '\0')
+ statret = -1;
+ new_root_dir = 0;
+ }
+ if (statret != 0 && basis_dir[0] != NULL) {
+ int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
+ itemizing, maybe_ATTRS_REPORT, code);
+ if (j == -2) {
+ itemizing = 0;
+ code = FNONE;
+ } else if (j >= 0)
+ statret = 1;
+ }
if (itemizing && f_out != -1) {
itemize(file, ndx, statret, &st,
statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
}
- if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
+ 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)) {
return;
}
}
- if (set_file_attrs(fname, file, statret ? NULL : &st, 0)
- && verbose && code && f_out != -1)
+ if (set_file_attrs(fname, file, real_ret ? NULL : &real_st, 0)
+ && verbose && code != FNONE && f_out != -1)
rprintf(code, "%s/\n", fname);
+ if (real_ret != 0 && one_file_system)
+ real_st.st_dev = filesystem_dev;
if (delete_during && f_out != -1 && !phase && dry_run < 2
&& (file->flags & FLAG_DEL_HERE))
- delete_in_dir(the_file_list, fname, file, &st);
+ delete_in_dir(the_file_list, fname, file, &real_st);
return;
}
char lnk[MAXPATHLEN];
int len;
- if (!S_ISDIR(st.st_mode)
- && (len = readlink(fname, lnk, MAXPATHLEN-1)) > 0) {
- lnk[len] = 0;
- /* A link already pointing to the
- * right place -- no further action
- * required. */
- if (strcmp(lnk, file->u.link) == 0) {
- if (itemizing) {
- itemize(file, ndx, 0, &st, 0,
- 0, NULL);
- }
- set_file_attrs(fname, file, &st,
- maybe_ATTRS_REPORT);
- if (preserve_hard_links
- && file->link_u.links) {
- hard_link_cluster(file, ndx,
- itemizing,
- code);
- }
- if (remove_source_files == 1)
- goto return_with_success;
- return;
- }
+ if (!S_ISLNK(st.st_mode))
+ statret = -1;
+ else if ((len = readlink(fname, lnk, MAXPATHLEN-1)) > 0
+ && strncmp(lnk, file->u.link, len) == 0
+ && file->u.link[len] == '\0') {
+ /* The link is pointing to the right place. */
+ if (itemizing)
+ itemize(file, ndx, 0, &st, 0, 0, NULL);
+ set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
+ if (preserve_hard_links && file->link_u.links)
+ hard_link_cluster(file, ndx, itemizing, code);
+ if (remove_source_files == 1)
+ goto return_with_success;
+ return;
}
/* Not the right symlink (or not a symlink), so
* delete it. */
- if (delete_item(fname, st.st_mode, del_opts) < 0)
+ if (delete_item(fname, st.st_mode, "symlink", del_opts) != 0)
return;
- if (!S_ISLNK(st.st_mode))
- statret = -1;
} else if (basis_dir[0] != NULL) {
- if (try_dests_non(file, fname, ndx, itemizing,
- maybe_ATTRS_REPORT, code) == -2) {
+ int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
+ itemizing, maybe_ATTRS_REPORT, code);
+ if (j == -2) {
#ifndef CAN_HARDLINK_SYMLINK
if (link_dest) {
/* Resort to --copy-dest behavior. */
#endif
if (!copy_dest)
return;
- itemizing = code = 0;
- }
+ itemizing = 0;
+ code = FNONE;
+ } else if (j >= 0)
+ statret = 1;
}
if (preserve_hard_links && file->link_u.links
&& hard_link_check(file, ndx, fname, -1, &st,
itemizing, code, HL_SKIP))
return;
- if (do_symlink(file->u.link,fname) != 0) {
+ if (do_symlink(file->u.link, fname) != 0) {
rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
full_fname(fname), file->u.link);
} else {
itemize(file, ndx, statret, &st,
ITEM_LOCAL_CHANGE, 0, NULL);
}
- if (code && verbose) {
- rprintf(code, "%s -> %s\n", fname,
- file->u.link);
- }
+ if (code != FNONE && verbose)
+ rprintf(code, "%s -> %s\n", fname, file->u.link);
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
+ /* This does not check remove_source_files == 1
+ * because this is one of the items that the old
+ * --remove-sent-files option would remove. */
if (remove_source_files)
goto return_with_success;
}
if ((am_root && preserve_devices && IS_DEVICE(file->mode))
|| (preserve_specials && IS_SPECIAL(file->mode))) {
- if (statret != 0 && basis_dir[0] != NULL) {
- if (try_dests_non(file, fname, ndx, itemizing,
- maybe_ATTRS_REPORT, code) == -2) {
+ if (statret == 0) {
+ char *t;
+ if (IS_DEVICE(file->mode)) {
+ if (!IS_DEVICE(st.st_mode))
+ statret = -1;
+ t = "device file";
+ } else {
+ if (!IS_SPECIAL(st.st_mode))
+ statret = -1;
+ t = "special file";
+ }
+ if (statret == 0
+ && (st.st_mode & ~CHMOD_BITS) == (file->mode & ~CHMOD_BITS)
+ && st.st_rdev == file->u.rdev) {
+ /* The device or special file is identical. */
+ if (itemizing)
+ itemize(file, ndx, 0, &st, 0, 0, NULL);
+ set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
+ if (preserve_hard_links && file->link_u.links)
+ hard_link_cluster(file, ndx, itemizing, code);
+ if (remove_source_files == 1)
+ goto return_with_success;
+ return;
+ }
+ if (delete_item(fname, st.st_mode, t, del_opts) != 0)
+ return;
+ } else if (basis_dir[0] != NULL) {
+ int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
+ itemizing, maybe_ATTRS_REPORT, code);
+ if (j == -2) {
#ifndef CAN_HARDLINK_SPECIAL
if (link_dest) {
/* Resort to --copy-dest behavior. */
#endif
if (!copy_dest)
return;
- itemizing = code = 0;
- }
+ itemizing = 0;
+ code = FNONE;
+ } else if (j >= 0)
+ statret = 1;
}
- if (statret != 0
- || (st.st_mode & ~CHMOD_BITS) != (file->mode & ~CHMOD_BITS)
- || st.st_rdev != file->u.rdev) {
- if (statret == 0
- && delete_item(fname, st.st_mode, del_opts) < 0)
- return;
- if (preserve_hard_links && file->link_u.links
- && hard_link_check(file, ndx, fname, -1, &st,
- itemizing, code, HL_SKIP))
- return;
- if ((IS_DEVICE(file->mode) && !IS_DEVICE(st.st_mode))
- || (IS_SPECIAL(file->mode) && !IS_SPECIAL(st.st_mode)))
- statret = -1;
- if (verbose > 2) {
- rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
- fname,
- (int)file->mode, (int)file->u.rdev);
- }
- if (do_mknod(fname,file->mode,file->u.rdev) < 0) {
- rsyserr(FERROR, errno, "mknod %s failed",
- full_fname(fname));
- } else {
- set_file_attrs(fname, file, NULL, 0);
- if (itemizing) {
- itemize(file, ndx, statret, &st,
- ITEM_LOCAL_CHANGE, 0, NULL);
- }
- if (code && verbose)
- rprintf(code, "%s\n", fname);
- if (preserve_hard_links && file->link_u.links) {
- hard_link_cluster(file, ndx,
- itemizing, code);
- }
- if (remove_source_files == 1)
- goto return_with_success;
- }
+ if (preserve_hard_links && file->link_u.links
+ && hard_link_check(file, ndx, fname, -1, &st,
+ itemizing, code, HL_SKIP))
+ return;
+ if (verbose > 2) {
+ rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
+ fname, (int)file->mode, (int)file->u.rdev);
+ }
+ if (do_mknod(fname, file->mode, file->u.rdev) < 0) {
+ rsyserr(FERROR, errno, "mknod %s failed",
+ full_fname(fname));
} else {
- if (itemizing)
- itemize(file, ndx, statret, &st, 0, 0, NULL);
- set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
+ set_file_attrs(fname, file, NULL, 0);
+ if (itemizing) {
+ itemize(file, ndx, statret, &st,
+ ITEM_LOCAL_CHANGE, 0, NULL);
+ }
+ if (code != FNONE && verbose)
+ rprintf(code, "%s\n", fname);
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
if (remove_source_files == 1)
fnamecmp_type = FNAMECMP_FNAME;
if (statret == 0 && !S_ISREG(st.st_mode)) {
- if (delete_item(fname, st.st_mode, del_opts) != 0)
+ if (delete_item(fname, st.st_mode, "regular file", del_opts) != 0)
return;
statret = -1;
stat_errno = ENOENT;
goto return_with_success;
return;
}
- if (j != -1) {
+ if (j >= 0) {
fnamecmp = fnamecmpbuf;
fnamecmp_type = j;
statret = 0;
if (protocol_version >= 29) {
itemizing = 1;
maybe_ATTRS_REPORT = stdout_format_has_i ? 0 : ATTRS_REPORT;
- code = logfile_format_has_i ? 0 : FLOG;
+ code = logfile_format_has_i ? FNONE : FLOG;
} else if (am_daemon) {
itemizing = logfile_format_has_i && do_xfers;
maybe_ATTRS_REPORT = ATTRS_REPORT;
} else if (!am_server) {
itemizing = stdout_format_has_i;
maybe_ATTRS_REPORT = stdout_format_has_i ? 0 : ATTRS_REPORT;
- code = itemizing ? 0 : FINFO;
+ code = itemizing ? FNONE : FINFO;
} else {
itemizing = 0;
maybe_ATTRS_REPORT = ATTRS_REPORT;
}
recv_generator(NULL, NULL, 0, 0, 0, code, -1);
- if (max_delete > 0 && deletion_count > max_delete) {
+ if (max_delete >= 0 && deletion_count > max_delete) {
rprintf(FINFO,
"Deletions stopped due to --max-delete limit (%d skipped)\n",
deletion_count - max_delete);
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff