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 FILE *delete_delay_fp = NULL;
+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 */
return ret;
}
-static void start_delete_temp(void)
+static int start_delete_delay_temp(void)
{
char fnametmp[MAXPATHLEN];
- int fd, save_dry_run = dry_run;
+ int save_dry_run = dry_run;
dry_run = 0;
if (!get_tmpname(fnametmp, "deldelay")
- || (fd = do_mkstemp(fnametmp, 0600)) < 0
- || !(delete_delay_fp = fdopen(fd, "w+"))) {
- rprintf(FERROR, "Unable to create delete-delay temp file.\n");
- exit_cleanup(RERR_FILEIO);
+ || (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;
}
- dry_run = save_dry_run;
unlink(fnametmp);
+ dry_run = save_dry_run;
+ return 1;
}
-static int read_delay_line(FILE *fp, char *buf, int bsize)
+static int flush_delete_delay(void)
{
- int ch, mode = 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;
+ close(deldelay_fd);
+ return 0;
+ }
+ deldelay_cnt = 0;
+ return 1;
+}
- if ((ch = fgetc(fp)) == EOF)
- 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) {
- if (ch == ' ')
+ for (j = read_pos; j < deldelay_cnt && deldelay_buf[j]; j++) {}
+ if (j < deldelay_cnt)
break;
- if (ch > '7' || ch < '0') {
- rprintf(FERROR, "invalid data in delete-delay file.\n");
- exit_cleanup(RERR_FILEIO);
+ 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;
}
- mode = mode*8 + ch - '0';
- if ((ch = fgetc(fp)) == EOF) {
- unexpected_eof:
- rprintf(FERROR, "unexpected EOF in delete-delay file.\n");
- exit_cleanup(RERR_FILEIO);
+ if (len < 0) {
+ rsyserr(FERROR, errno,
+ "reading delete-delay file");
+ return -1;
}
+ deldelay_cnt += len;
+ read_pos = 0;
}
- while (1) {
- if ((ch = fgetc(fp)) == EOF)
- goto unexpected_eof;
- if (bsize-- <= 0) {
- rprintf(FERROR, "filename too long in delete-delay file.\n");
- exit_cleanup(RERR_FILEIO);
- }
- *buf++ = (char)ch;
- if (ch == '\0')
- break;
+ 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 delayed_deletions(char *delbuf)
+static void do_delayed_deletions(char *delbuf)
{
int mode;
- fseek(delete_delay_fp, 0, 0);
- while ((mode = read_delay_line(delete_delay_fp, delbuf, MAXPATHLEN)) >= 0)
+ 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);
- fclose(delete_delay_fp);
+ if (deldelay_fd >= 0)
+ close(deldelay_fd);
}
/* This function is used to implement per-directory deletion, and is used by
}
if (flist_find(flist, fp) < 0) {
f_name(fp, delbuf);
- if (delete_delay_fp)
- fprintf(delete_delay_fp, "%o %s%c", (short)fp->mode, delbuf, '\0');
- else
+ if (delete_during == 2) {
+ if (!remember_delete(fp, delbuf))
+ break;
+ } else
delete_item(delbuf, fp->mode, NULL, DEL_RECURSE);
}
}
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 != F_UID(file))
&& (!(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 && F_UID(file) != st->st_uid)
iflags |= ITEM_REPORT_OWNER;
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) {
if (!F_IS_HLINKED(file))
continue;
- hard_link_cluster(file, ndx, itemizing, code, -1);
+ finish_hard_link(file, f_name(file, fbuf), NULL, itemizing, code, -1);
}
}
#endif
* 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 && F_IS_HLINKED(file))
- hard_link_cluster(file, ndx, itemizing, code, j);
+ 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",
}
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && F_IS_HLINKED(file))
- hard_link_cluster(file, ndx, itemizing, code, j);
+ 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 != MAKEDEV(F_DMAJOR(file), F_DMINOR(file)))
+ devp = F_RDEV_P(file);
+ if (stp->st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)))
continue;
break;
#ifdef SUPPORT_LINKS
return j;
}
if (preserve_hard_links && F_IS_HLINKED(file))
- hard_link_cluster(file, ndx, itemizing, code, -1);
+ 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;
}
#ifdef SUPPORT_HARD_LINKS
- if (preserve_hard_links && F_IS_HLINKED(file)
- && hard_link_check(file, ndx, fname, statret, &st,
- itemizing, code, HL_CHECK_MASTER))
+ if (preserve_hard_links && F_HLINK_NOT_FIRST(file)
+ && hard_link_check(file, ndx, fname, statret, &st, itemizing, code))
return;
#endif
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",
set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && F_IS_HLINKED(file))
- hard_link_cluster(file, ndx, itemizing, code, -1);
+ finish_hard_link(file, fname, &st, itemizing, code, -1);
#endif
if (remove_source_files == 1)
goto return_with_success;
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) {
statret = 1;
}
#ifdef SUPPORT_HARD_LINKS
- if (preserve_hard_links && F_IS_HLINKED(file)
- && hard_link_check(file, ndx, fname, -1, &st,
- itemizing, code, HL_SKIP))
+ if (preserve_hard_links && F_HLINK_NOT_LAST(file))
return;
#endif
if (do_symlink(sl, fname) != 0) {
rprintf(code, "%s -> %s\n", fname, sl);
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && F_IS_HLINKED(file))
- hard_link_cluster(file, ndx, itemizing, code, -1);
+ 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
if ((am_root && preserve_devices && IS_DEVICE(file->mode))
|| (preserve_specials && IS_SPECIAL(file->mode))) {
- dev_t rdev = MAKEDEV(F_DMAJOR(file), F_DMINOR(file));
+ 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)
+ && BITS_EQUAL(st.st_mode, file->mode, _S_IFMT)
&& st.st_rdev == rdev) {
/* The device or special file is identical. */
if (itemizing)
set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && F_IS_HLINKED(file))
- hard_link_cluster(file, ndx, itemizing, code, -1);
+ finish_hard_link(file, fname, &st, itemizing, code, -1);
#endif
if (remove_source_files == 1)
goto return_with_success;
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) {
statret = 1;
}
#ifdef SUPPORT_HARD_LINKS
- if (preserve_hard_links && F_IS_HLINKED(file)
- && hard_link_check(file, ndx, fname, -1, &st,
- itemizing, code, HL_SKIP))
+ if (preserve_hard_links && F_HLINK_NOT_LAST(file))
return;
#endif
if (verbose > 2) {
rprintf(code, "%s\n", fname);
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && F_IS_HLINKED(file))
- hard_link_cluster(file, ndx, itemizing, code, -1);
+ 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 && 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);
}
}
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;
if (statret != 0) {
#ifdef SUPPORT_HARD_LINKS
- if (preserve_hard_links && F_IS_HLINKED(file)
- && hard_link_check(file, ndx, fname, statret, &st,
- itemizing, code, HL_SKIP))
+ if (preserve_hard_links && F_HLINK_NOT_LAST(file))
return;
#endif
if (stat_errno == ENOENT)
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);
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && F_IS_HLINKED(file))
- hard_link_cluster(file, ndx, itemizing, code, -1);
+ finish_hard_link(file, fname, &st, itemizing, code, -1);
#endif
if (remove_source_files != 1)
return;
pretend_missing:
/* pretend the file didn't exist */
#ifdef SUPPORT_HARD_LINKS
- if (preserve_hard_links && F_IS_HLINKED(file)
- && hard_link_check(file, ndx, fname, statret, &st,
- itemizing, code, HL_SKIP))
+ if (preserve_hard_links && F_HLINK_NOT_LAST(file))
return;
#endif
statret = real_ret = -1;
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 (!do_xfers) {
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && F_IS_HLINKED(file))
- hard_link_cluster(file, ndx, itemizing, code, -1);
+ finish_hard_link(file, fname, &st, itemizing, code, -1);
#endif
return;
}
{
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)
- start_delete_temp();
+ 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)
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
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);
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++;
}
do_progress = save_do_progress;
- if (delete_delay_fp)
- delayed_deletions(fbuf);
+ if (delete_during == 2)
+ do_delayed_deletions(fbuf);
if (delete_after && !local_name && flist->count > 0)
do_delete_pass(flist);
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,
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff