int ignore_perishable = 0;
int non_perishable_cnt = 0;
+int maybe_ATTRS_REPORT = 0;
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 BOOL solo_file = 0;
/* For calling delete_item() and delete_dir_contents(). */
#define DEL_RECURSE (1<<1) /* recurse */
/* 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
+ * 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 *fname, int mode, char *replace, int flags)
+static enum delret delete_item(char *fbuf, int mode, char *replace, int flags)
{
enum delret ret;
char *what;
if (verbose > 2) {
rprintf(FINFO, "delete_item(%s) mode=%o flags=%d\n",
- fname, mode, flags);
+ fbuf, mode, flags);
}
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);
+ ret = delete_dir_contents(fbuf, flags);
ignore_perishable = 0;
if (ret == DR_NOT_EMPTY || ret == DR_AT_LIMIT)
goto check_ret;
if (S_ISDIR(mode)) {
what = "rmdir";
- ok = do_rmdir(fname) == 0;
- } else if (make_backups && (backup_dir || !is_backup_file(fname))) {
+ ok = do_rmdir(fbuf) == 0;
+ } else if (make_backups && (backup_dir || !is_backup_file(fbuf))) {
what = "make_backup";
- ok = make_backup(fname);
+ ok = make_backup(fbuf);
} else {
what = "unlink";
- ok = robust_unlink(fname) == 0;
+ ok = robust_unlink(fbuf) == 0;
}
if (ok) {
if (!replace)
- log_delete(fname, mode);
+ log_delete(fbuf, mode);
ret = DR_SUCCESS;
} else {
if (S_ISDIR(mode) && errno == ENOTEMPTY) {
rprintf(FINFO, "cannot delete non-empty directory: %s\n",
- fname);
+ fbuf);
ret = DR_NOT_EMPTY;
} else if (errno != ENOENT) {
rsyserr(FERROR, errno, "delete_file: %s(%s) failed",
- what, full_fname(fname));
+ what, fbuf);
ret = DR_FAILURE;
} else {
deletion_count--;
check_ret:
if (replace && ret != DR_SUCCESS) {
rprintf(FERROR, "could not make way for new %s: %s\n",
- replace, fname);
+ replace, fbuf);
}
return ret;
}
for (j = dirlist->count; j--; ) {
struct file_struct *fp = dirlist->files[j];
- if (fp->flags & FLAG_MOUNT_POINT) {
+ if (fp->flags & FLAG_MOUNT_DIR) {
if (verbose > 1) {
rprintf(FINFO,
"mount point, %s, pins parent directory\n",
continue;
}
- strlcpy(p, fp->basename, remainder);
+ strlcpy(p, F_BASENAME(fp), remainder);
/* Save stack by recursing to ourself directly. */
if (S_ISDIR(fp->mode)
&& delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
return ret;
}
+static int start_delete_delay_temp(void)
+{
+ char fnametmp[MAXPATHLEN];
+ int save_dry_run = dry_run;
+
+ dry_run = 0;
+ if (!get_tmpname(fnametmp, "deldelay")
+ || (deldelay_fd = do_mkstemp(fnametmp, 0600)) < 0) {
+ rprintf(FINFO, "NOTE: Unable to create delete-delay temp file--"
+ "switching to --delete-after.\n");
+ delete_during = 0;
+ delete_after = 1;
+ dry_run = save_dry_run;
+ return 0;
+ }
+ unlink(fnametmp);
+ dry_run = save_dry_run;
+ return 1;
+}
+
+static int flush_delete_delay(void)
+{
+ if (write(deldelay_fd, deldelay_buf, deldelay_cnt) != deldelay_cnt) {
+ rsyserr(FERROR, errno, "flush of delete-delay buffer");
+ delete_during = 0;
+ delete_after = 1;
+ close(deldelay_fd);
+ return 0;
+ }
+ deldelay_cnt = 0;
+ return 1;
+}
+
+static int remember_delete(struct file_struct *file, const char *fname)
+{
+ int len;
+
+ while (1) {
+ len = snprintf(deldelay_buf + deldelay_cnt,
+ deldelay_size - deldelay_cnt,
+ "%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)
+{
+ static int read_pos = 0;
+ int j, len, mode;
+ char *bp, *past_space;
+
+ while (1) {
+ for (j = read_pos; j < deldelay_cnt && deldelay_buf[j]; j++) {}
+ if (j < deldelay_cnt)
+ break;
+ if (deldelay_fd < 0) {
+ if (j > read_pos)
+ goto invalid_data;
+ return -1;
+ }
+ deldelay_cnt -= read_pos;
+ if (deldelay_cnt == deldelay_size)
+ goto invalid_data;
+ if (deldelay_cnt && read_pos) {
+ memmove(deldelay_buf, deldelay_buf + read_pos,
+ deldelay_cnt);
+ }
+ len = read(deldelay_fd, deldelay_buf + deldelay_cnt,
+ deldelay_size - deldelay_cnt);
+ if (len == 0) {
+ if (deldelay_cnt) {
+ rprintf(FERROR,
+ "ERROR: unexpected EOF in delete-delay file.\n");
+ }
+ return -1;
+ }
+ if (len < 0) {
+ rsyserr(FERROR, errno,
+ "reading delete-delay file");
+ return -1;
+ }
+ deldelay_cnt += len;
+ read_pos = 0;
+ }
+
+ bp = deldelay_buf + read_pos;
+
+ if (sscanf(bp, "%x ", &mode) != 1) {
+ invalid_data:
+ rprintf(FERROR, "ERROR: invalid data in delete-delay file.\n");
+ return -1;
+ }
+ past_space = strchr(bp, ' ') + 1;
+ len = j - read_pos - (past_space - bp) + 1; /* count the '\0' */
+ read_pos = j + 1;
+
+ if (len > MAXPATHLEN) {
+ rprintf(FERROR, "ERROR: filename too long in delete-delay file.\n");
+ return -1;
+ }
+
+ /* The caller needs the name in a MAXPATHLEN buffer, so we copy it
+ * instead of returning a pointer to our buffer. */
+ memcpy(buf, past_space, len);
+
+ return mode;
+}
+
+static void do_delayed_deletions(char *delbuf)
+{
+ int mode;
+
+ 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);
+ if (deldelay_fd >= 0)
+ close(deldelay_fd);
+}
/* This function is used to implement per-directory deletion, and is used by
* all the --delete-WHEN options. Note that the fbuf pointer must point to a
* from the filesystem. */
for (i = dirlist->count; i--; ) {
struct file_struct *fp = dirlist->files[i];
- if (!fp->basename)
+ if (!F_IS_ACTIVE(fp))
continue;
- if (fp->flags & FLAG_MOUNT_POINT) {
+ if (fp->flags & FLAG_MOUNT_DIR) {
if (verbose > 1)
rprintf(FINFO, "cannot delete mount point: %s\n",
f_name(fp, NULL));
}
if (flist_find(flist, fp) < 0) {
f_name(fp, delbuf);
- delete_item(delbuf, fp->mode, NULL, DEL_RECURSE);
+ if (delete_during == 2) {
+ if (!remember_delete(fp, delbuf))
+ break;
+ } else
+ delete_item(delbuf, fp->mode, NULL, DEL_RECURSE);
}
}
for (j = 0; j < flist->count; j++) {
struct file_struct *file = flist->files[j];
- if (!(file->flags & FLAG_DEL_HERE))
+ if (!(file->flags & FLAG_XFER_DIR))
continue;
f_name(file, fbuf);
int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
{
- if (preserve_perms
- && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
+ if (preserve_perms && !BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
return 0;
- if (am_root && preserve_uid && st->st_uid != file->uid)
+ if (am_root && preserve_uid && st->st_uid != F_UID(file))
return 0;
- if (preserve_gid && file->gid != GID_NONE && st->st_gid != file->gid)
+ if (preserve_gid && F_GID(file) != GID_NONE && st->st_gid != F_GID(file))
return 0;
return 1;
: S_ISDIR(file->mode) ? !omit_dir_times
: !S_ISLNK(file->mode);
- if (S_ISREG(file->mode) && file->length != st->st_size)
+ if (S_ISREG(file->mode) && F_LENGTH(file) != st->st_size)
iflags |= ITEM_REPORT_SIZE;
if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
&& !(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))
+ if (!BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
- if (preserve_uid && am_root && file->uid != st->st_uid)
+ if (preserve_uid && am_root && F_UID(file) != st->st_uid)
iflags |= ITEM_REPORT_OWNER;
- if (preserve_gid && file->gid != GID_NONE
- && st->st_gid != file->gid)
+ if (preserve_gid && F_GID(file) != GID_NONE
+ && st->st_gid != F_GID(file))
iflags |= ITEM_REPORT_GROUP;
} else
iflags |= ITEM_IS_NEW;
/* Perform our quick-check heuristic for determining if a file is unchanged. */
int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
{
- if (st->st_size != file->length)
+ if (st->st_size != F_LENGTH(file))
return 0;
/* if always checksum is set then we use the checksum instead
if (always_checksum && S_ISREG(st->st_mode)) {
char sum[MD4_SUM_LENGTH];
file_checksum(fn, sum, st->st_size);
- return memcmp(sum, file->u.sum, checksum_len) == 0;
+ return memcmp(sum, F_SUM(file), checksum_len) == 0;
}
if (size_only)
static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
{
int fname_len, fname_suf_len;
- const char *fname_suf, *fname = file->basename;
+ const char *fname_suf, *fname = F_BASENAME(file);
uint32 lowest_dist = 25 << 16; /* ignore a distance greater than 25 */
int j, lowest_j = -1;
int len, suf_len;
uint32 dist;
- if (!S_ISREG(fp->mode) || !fp->length
- || fp->flags & FLAG_NO_FUZZY)
+ if (!S_ISREG(fp->mode) || !F_LENGTH(fp) || fp->flags & FLAG_SENT)
continue;
- name = fp->basename;
+ name = F_BASENAME(fp);
- if (fp->length == file->length
+ if (F_LENGTH(fp) == F_LENGTH(file)
&& cmp_time(fp->modtime, file->modtime) == 0) {
if (verbose > 4) {
rprintf(FINFO,
return lowest_j;
}
+#ifdef SUPPORT_HARD_LINKS
void check_for_finished_hlinks(int itemizing, enum logcode code)
{
struct file_struct *file;
+ char fbuf[MAXPATHLEN];
int ndx;
while ((ndx = get_hlink_num()) != -1) {
continue;
file = the_file_list->files[ndx];
- if (!file->link_u.links)
+ if (!F_IS_HLINKED(file))
continue;
- hard_link_cluster(file, ndx, itemizing, code);
+ finish_hard_link(file, f_name(file, fbuf), NULL, itemizing, code, -1);
}
}
+#endif
/* This is only called for regular files. We return -2 if we've finished
* handling the file, -1 if no dest-linking occurred, or a non-negative
* value if we found an alternate basis file. */
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
char *cmpbuf, STRUCT_STAT *stp, int itemizing,
- int maybe_ATTRS_REPORT, enum logcode code)
+ enum logcode code)
{
int best_match = -1;
int match_level = 0;
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, i, code) < 0)
+ if (!hard_link_one(file, fname, cmpbuf, 1))
goto try_a_copy;
- 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);
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ finish_hard_link(file, fname, stp, itemizing, code, j);
+ if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
+ itemize(file, ndx, 1, stp,
+ ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
+ 0, "");
}
} else
#endif
if (itemizing)
itemize(file, ndx, 0, stp, 0, 0, NULL);
- if (verbose > 1 && maybe_ATTRS_REPORT) {
+ if (verbose > 1 && maybe_ATTRS_REPORT)
rprintf(FCLIENT, "%s is uptodate\n", fname);
- }
return -2;
}
if (match_level >= 2) {
+#ifdef SUPPORT_HARD_LINKS
try_a_copy: /* Copy the file locally. */
+#endif
if (copy_file(cmpbuf, fname, file->mode) < 0) {
if (verbose) {
rsyserr(FINFO, errno, "copy_file %s => %s",
rprintf(code, "%s%s\n", fname,
match_level == 3 ? " is uptodate" : "");
}
- if (preserve_hard_links && file->link_u.links)
- hard_link_cluster(file, ndx, itemizing, code);
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ finish_hard_link(file, fname, stp, itemizing, code, -1);
+#endif
return -2;
}
* value if we found an alternate basis file. */
static int try_dests_non(struct file_struct *file, char *fname, int ndx,
char *cmpbuf, STRUCT_STAT *stp, int itemizing,
- int maybe_ATTRS_REPORT, enum logcode code)
+ enum logcode code)
{
char lnk[MAXPATHLEN];
int best_match = -1;
int match_level = 0;
enum nonregtype type;
+ uint32 *devp;
int len, j = 0;
#ifndef SUPPORT_LINKS
break;
case TYPE_SPECIAL:
case TYPE_DEVICE:
- if (stp->st_rdev != file->u.rdev)
+ devp = F_RDEV_P(file);
+ if (stp->st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)))
continue;
break;
#ifdef SUPPORT_LINKS
if ((len = readlink(cmpbuf, lnk, MAXPATHLEN-1)) <= 0)
continue;
lnk[len] = '\0';
- if (strcmp(lnk, file->u.link) != 0)
+ if (strcmp(lnk, F_SYMLINK(file)) != 0)
continue;
break;
#endif
cmpbuf, fname);
return j;
}
- if (preserve_hard_links && file->link_u.links)
- hard_link_cluster(file, ndx, itemizing, code);
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ finish_hard_link(file, fname, NULL, itemizing, code, -1);
} else
#endif
match_level = 2;
* Note that f_out is set to -1 when doing final directory-permission and
* modification-time repair. */
static void recv_generator(char *fname, struct file_struct *file, int ndx,
- int itemizing, int maybe_ATTRS_REPORT,
- enum logcode code, int f_out)
+ int itemizing, enum logcode code, int f_out)
{
static int missing_below = -1, excluded_below = -1;
static const char *parent_dirname = "";
}
if (statret != 0 && basis_dir[0] != NULL) {
int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
- itemizing, maybe_ATTRS_REPORT, code);
+ itemizing, code);
if (j == -2) {
itemizing = 0;
code = FNONE;
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
full_fname(fname));
- file->flags |= FLAG_MISSING;
+ file->flags |= FLAG_MISSING_DIR;
if (ndx+1 < the_file_list->count
&& the_file_list->files[ndx+1]->dir.depth > file->dir.depth) {
rprintf(FERROR,
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))
+ && (file->flags & FLAG_XFER_DIR))
delete_in_dir(the_file_list, fname, file, &real_st);
return;
}
- if (preserve_hard_links && file->link_u.links
- && hard_link_check(file, ndx, fname, statret, &st,
- itemizing, code, HL_CHECK_MASTER))
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_HLINK_NOT_FIRST(file)
+ && hard_link_check(file, ndx, fname, statret, &st, itemizing, code))
return;
+#endif
if (preserve_links && S_ISLNK(file->mode)) {
#ifdef SUPPORT_LINKS
- if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
+ const char *sl = F_SYMLINK(file);
+ if (safe_symlinks && unsafe_symlink(sl, fname)) {
if (verbose) {
- if (the_file_list->count == 1)
+ if (solo_file)
fname = f_name(file, NULL);
rprintf(FINFO,
"ignoring unsafe symlink %s -> \"%s\"\n",
- full_fname(fname), file->u.link);
+ full_fname(fname), sl);
}
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') {
+ && strncmp(lnk, sl, len) == 0 && sl[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);
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ finish_hard_link(file, fname, &st, itemizing, code, -1);
+#endif
if (remove_source_files == 1)
goto return_with_success;
return;
return;
} else if (basis_dir[0] != NULL) {
int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
- itemizing, maybe_ATTRS_REPORT, code);
+ itemizing, code);
if (j == -2) {
#ifndef CAN_HARDLINK_SYMLINK
if (link_dest) {
} 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))
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_HLINK_NOT_LAST(file))
return;
- if (do_symlink(file->u.link, fname) != 0) {
+#endif
+ if (do_symlink(sl, fname) != 0) {
rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
- full_fname(fname), file->u.link);
+ full_fname(fname), sl);
} else {
set_file_attrs(fname, file, NULL, 0);
if (itemizing) {
ITEM_LOCAL_CHANGE, 0, NULL);
}
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);
+ rprintf(code, "%s -> %s\n", fname, sl);
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ finish_hard_link(file, fname, NULL, itemizing, code, -1);
+#endif
/* 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 ((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));
if (statret == 0) {
char *t;
if (IS_DEVICE(file->mode)) {
t = "special file";
}
if (statret == 0
- && (st.st_mode & ~CHMOD_BITS) == (file->mode & ~CHMOD_BITS)
- && st.st_rdev == file->u.rdev) {
+ && BITS_EQUAL(st.st_mode, file->mode, _S_IFMT)
+ && st.st_rdev == 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);
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ finish_hard_link(file, fname, &st, itemizing, code, -1);
+#endif
if (remove_source_files == 1)
goto return_with_success;
return;
return;
} else if (basis_dir[0] != NULL) {
int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
- itemizing, maybe_ATTRS_REPORT, code);
+ itemizing, code);
if (j == -2) {
#ifndef CAN_HARDLINK_SPECIAL
if (link_dest) {
} 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))
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_HLINK_NOT_LAST(file))
return;
+#endif
if (verbose > 2) {
- rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
- fname, (int)file->mode, (int)file->u.rdev);
+ rprintf(FINFO, "mknod(%s, 0%o, [%ld,%ld])\n",
+ fname, (int)file->mode,
+ (long)major(rdev), (long)minor(rdev));
}
- if (do_mknod(fname, file->mode, file->u.rdev) < 0) {
+ if (do_mknod(fname, file->mode, rdev) < 0) {
rsyserr(FERROR, errno, "mknod %s failed",
full_fname(fname));
} else {
}
if (code != FNONE && verbose)
rprintf(code, "%s\n", fname);
- if (preserve_hard_links && file->link_u.links)
- hard_link_cluster(file, ndx, itemizing, code);
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ finish_hard_link(file, fname, NULL, itemizing, code, -1);
+#endif
if (remove_source_files == 1)
goto return_with_success;
}
}
if (!S_ISREG(file->mode)) {
- if (the_file_list->count == 1)
+ if (solo_file)
fname = f_name(file, NULL);
rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname);
return;
}
- if (max_size && file->length > max_size) {
+ if (max_size && F_LENGTH(file) > max_size) {
if (verbose > 1) {
- if (the_file_list->count == 1)
+ if (solo_file)
fname = f_name(file, NULL);
rprintf(FINFO, "%s is over max-size\n", fname);
}
return;
}
- if (min_size && file->length < min_size) {
+ if (min_size && F_LENGTH(file) < min_size) {
if (verbose > 1) {
- if (the_file_list->count == 1)
+ if (solo_file)
fname = f_name(file, NULL);
rprintf(FINFO, "%s is under min-size\n", fname);
}
if (statret != 0 && basis_dir[0] != NULL) {
int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st,
- itemizing, maybe_ATTRS_REPORT, code);
+ itemizing, code);
if (j == -2) {
if (remove_source_files == 1)
goto return_with_success;
rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
fname, fnamecmpbuf);
}
- st.st_size = fuzzy_file->length;
+ st.st_size = F_LENGTH(fuzzy_file);
statret = 0;
fnamecmp = fnamecmpbuf;
fnamecmp_type = FNAMECMP_FUZZY;
}
if (statret != 0) {
- if (preserve_hard_links && file->link_u.links
- && hard_link_check(file, ndx, fname, statret, &st,
- itemizing, code, HL_SKIP))
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_HLINK_NOT_LAST(file))
return;
+#endif
if (stat_errno == ENOENT)
goto notify_others;
rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s",
return;
}
- if (append_mode && st.st_size > file->length)
+ if (append_mode && st.st_size > F_LENGTH(file))
return;
if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
do_unlink(partialptr);
handle_partial_dir(partialptr, PDIR_DELETE);
}
- if (itemizing) {
- itemize(file, ndx, real_ret, &real_st,
- 0, 0, NULL);
- }
+ if (itemizing)
+ itemize(file, ndx, statret, &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);
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ finish_hard_link(file, fname, &st, itemizing, code, -1);
+#endif
if (remove_source_files != 1)
return;
return_with_success:
- if (!dry_run) {
- char numbuf[4];
- SIVAL(numbuf, 0, ndx);
- send_msg(MSG_SUCCESS, numbuf, 4);
- }
+ if (!dry_run)
+ send_msg_int(MSG_SUCCESS, ndx);
return;
}
if (fuzzy_dirlist) {
int j = flist_find(fuzzy_dirlist, file);
if (j >= 0) /* don't use changing file as future fuzzy basis */
- fuzzy_dirlist->files[j]->flags |= FLAG_NO_FUZZY;
+ fuzzy_dirlist->files[j]->flags |= FLAG_SENT;
}
/* open the file */
full_fname(fnamecmp));
pretend_missing:
/* pretend the file didn't exist */
- if (preserve_hard_links && file->link_u.links
- && hard_link_check(file, ndx, fname, statret, &st,
- itemizing, code, HL_SKIP))
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_HLINK_NOT_LAST(file))
return;
+#endif
statret = real_ret = -1;
goto notify_others;
}
if (robust_unlink(backupptr) && errno != ENOENT) {
rsyserr(FERROR, errno, "unlink %s",
full_fname(backupptr));
- free(back_file);
+ unmake_file(back_file);
close(fd);
return;
}
O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
rsyserr(FERROR, errno, "open %s",
full_fname(backupptr));
- free(back_file);
+ unmake_file(back_file);
close(fd);
return;
}
notify_others:
if (remove_source_files && !delay_updates && !phase)
increment_active_files(ndx, itemizing, code);
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ file->flags |= FLAG_SENT;
+#endif
write_int(f_out, ndx);
if (itemizing) {
int iflags = ITEM_TRANSFER;
if (fnamecmp_type == FNAMECMP_FUZZY)
iflags |= ITEM_XNAME_FOLLOWS;
itemize(file, -1, real_ret, &real_st, iflags, fnamecmp_type,
- fuzzy_file ? fuzzy_file->basename : NULL);
+ fuzzy_file ? F_BASENAME(fuzzy_file) : NULL);
}
if (!do_xfers) {
- if (preserve_hard_links && file->link_u.links)
- hard_link_cluster(file, ndx, itemizing, code);
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ finish_hard_link(file, fname, &st, itemizing, code, -1);
+#endif
return;
}
if (read_batch)
rprintf(FINFO, "backed up %s to %s\n",
fname, backupptr);
}
- free(back_file);
+ unmake_file(back_file);
}
close(fd);
{
int i;
char fbuf[MAXPATHLEN];
- int itemizing, maybe_ATTRS_REPORT;
+ int itemizing;
enum logcode code;
int lull_mod = allowed_lull * 5;
int need_retouch_dir_times = preserve_times && !omit_dir_times;
maybe_ATTRS_REPORT = ATTRS_REPORT;
code = FINFO;
}
+ solo_file = local_name != NULL;
if (verbose > 2) {
rprintf(FINFO, "generator starting pid=%ld count=%d\n",
if (delete_before && !local_name && flist->count > 0)
do_delete_pass(flist);
+ if (delete_during == 2) {
+ deldelay_size = BIGPATHBUFLEN * 4;
+ deldelay_buf = new_array(char, deldelay_size);
+ if (!deldelay_buf)
+ out_of_memory("delete-delay");
+ }
do_progress = 0;
if (append_mode || whole_file < 0)
for (i = 0; i < flist->count; i++) {
struct file_struct *file = flist->files[i];
- if (!file->basename)
+ if (!F_IS_ACTIVE(file))
continue;
if (local_name)
strlcpy(fbuf, local_name, sizeof fbuf);
else
f_name(file, fbuf);
- recv_generator(fbuf, file, i, itemizing, maybe_ATTRS_REPORT,
- code, f_out);
+ recv_generator(fbuf, file, i, itemizing, code, f_out);
/* We need to ensure that any dirs we create have writeable
* permissions during the time we are putting files within
}
#endif
+#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links)
check_for_finished_hlinks(itemizing, code);
+#endif
if (allowed_lull && !(i % lull_mod))
maybe_send_keepalive();
else if (!(i % 200))
maybe_flush_socket();
}
- recv_generator(NULL, NULL, 0, 0, 0, code, -1);
+ recv_generator(NULL, NULL, 0, 0, code, -1);
if (delete_during)
delete_in_dir(NULL, NULL, NULL, NULL);
make_backups = 0; /* avoid a duplicate backup for inplace processing */
if (verbose > 2)
- rprintf(FINFO,"generate_files phase=%d\n",phase);
+ rprintf(FINFO, "generate_files phase=%d\n", phase);
- write_int(f_out, -1);
+ write_int(f_out, NDX_DONE);
/* files can cycle through the system more than once
* to catch initial checksum errors */
strlcpy(fbuf, local_name, sizeof fbuf);
else
f_name(file, fbuf);
- recv_generator(fbuf, file, i, itemizing, maybe_ATTRS_REPORT,
- code, f_out);
+ recv_generator(fbuf, file, i, itemizing, code, f_out);
}
phase++;
make_backups = save_make_backups;
if (verbose > 2)
- rprintf(FINFO,"generate_files phase=%d\n",phase);
+ rprintf(FINFO, "generate_files phase=%d\n", phase);
- write_int(f_out, -1);
+ write_int(f_out, NDX_DONE);
/* Reduce round-trip lag-time for a useless delay-updates phase. */
if (protocol_version >= 29 && !delay_updates)
- write_int(f_out, -1);
+ write_int(f_out, NDX_DONE);
/* Read MSG_DONE for the redo phase (and any prior messages). */
get_redo_num(itemizing, code);
if (verbose > 2)
rprintf(FINFO, "generate_files phase=%d\n", phase);
if (delay_updates)
- write_int(f_out, -1);
+ write_int(f_out, NDX_DONE);
/* Read MSG_DONE for delay-updates phase & prior messages. */
get_redo_num(itemizing, code);
}
do_progress = save_do_progress;
+ if (delete_during == 2)
+ do_delayed_deletions(fbuf);
if (delete_after && !local_name && flist->count > 0)
do_delete_pass(flist);
* modified-time values. */
for (i = 0; i < flist->count; i++) {
struct file_struct *file = flist->files[i];
-
- if (!file->basename || !S_ISDIR(file->mode))
+ if (!F_IS_ACTIVE(file) || !S_ISDIR(file->mode))
continue;
if (!need_retouch_dir_times && file->mode & S_IWUSR)
continue;
- if (file->flags & FLAG_MISSING) {
+ if (file->flags & FLAG_MISSING_DIR) {
int missing = file->dir.depth;
while (++i < flist->count) {
file = flist->files[i];
continue;
}
recv_generator(f_name(file, NULL), file, i, itemizing,
- maybe_ATTRS_REPORT, code, -1);
+ code, -1);
if (allowed_lull && !(++j % lull_mod))
maybe_send_keepalive();
else if (!(j % 200))
maybe_flush_socket();
}
}
- recv_generator(NULL, NULL, 0, 0, 0, code, -1);
+ recv_generator(NULL, NULL, 0, 0, code, -1);
if (max_delete >= 0 && deletion_count > max_delete) {
rprintf(FINFO,
}
if (verbose > 2)
- rprintf(FINFO,"generate_files finished\n");
+ rprintf(FINFO, "generate_files finished\n");
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff