extern int delete_after;
extern int module_id;
extern int ignore_errors;
-extern int flist_extra_ndx;
extern int remove_source_files;
extern int delay_updates;
extern int update_only;
extern int max_delete;
extern int force_delete;
extern int one_file_system;
-extern int file_struct_len;
extern struct stats stats;
extern dev_t filesystem_dev;
extern char *backup_dir;
int non_perishable_cnt = 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 */
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 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);
}
- 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);
+ 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;
}
- 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
* 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_DIR) {
if (verbose > 1)
}
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))
+ && (unsigned)(st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
return 0;
if (am_root && preserve_uid && st->st_uid != F_UID(file))
: 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 ((unsigned)(st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
if (preserve_uid && am_root && F_UID(file) != st->st_uid)
iflags |= ITEM_REPORT_OWNER;
/* 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
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_SENT)
+ 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;
continue;
file = the_file_list->files[ndx];
- if (!IS_HLINKED(file))
+ if (!F_IS_HLINKED(file))
continue;
hard_link_cluster(file, ndx, 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
if (hard_link_one(file, ndx, fname, 0, stp,
cmpbuf, 1, i, code) < 0)
goto try_a_copy;
- if (preserve_hard_links && IS_HLINKED(file))
+ if (preserve_hard_links && F_IS_HLINKED(file))
hard_link_cluster(file, ndx, itemizing, code, j);
} else
#endif
rprintf(code, "%s%s\n", fname,
match_level == 3 ? " is uptodate" : "");
}
- if (preserve_hard_links && IS_HLINKED(file))
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
hard_link_cluster(file, ndx, itemizing, code, j);
+#endif
return -2;
}
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
cmpbuf, fname);
return j;
}
- if (preserve_hard_links && IS_HLINKED(file))
+ if (preserve_hard_links && F_IS_HLINKED(file))
hard_link_cluster(file, ndx, itemizing, code, -1);
} else
#endif
return;
}
- if (preserve_hard_links && IS_HLINKED(file)
+#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))
return;
+#endif
if (preserve_links && S_ISLNK(file->mode)) {
#ifdef SUPPORT_LINKS
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",
if (itemizing)
itemize(file, ndx, 0, &st, 0, 0, NULL);
set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
- if (preserve_hard_links && IS_HLINKED(file))
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
hard_link_cluster(file, ndx, itemizing, code, -1);
+#endif
if (remove_source_files == 1)
goto return_with_success;
return;
} else if (j >= 0)
statret = 1;
}
- if (preserve_hard_links && IS_HLINKED(file)
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file)
&& hard_link_check(file, ndx, fname, -1, &st,
itemizing, code, HL_SKIP))
return;
+#endif
if (do_symlink(sl, fname) != 0) {
rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
full_fname(fname), sl);
}
if (code != FNONE && verbose)
rprintf(code, "%s -> %s\n", fname, sl);
- if (preserve_hard_links && IS_HLINKED(file))
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
hard_link_cluster(file, ndx, 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))) {
- 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)
+ && (unsigned)(st.st_mode & ~CHMOD_BITS) == (file->mode & ~CHMOD_BITS)
&& 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 && IS_HLINKED(file))
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
hard_link_cluster(file, ndx, itemizing, code, -1);
+#endif
if (remove_source_files == 1)
goto return_with_success;
return;
} else if (j >= 0)
statret = 1;
}
- if (preserve_hard_links && IS_HLINKED(file)
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file)
&& hard_link_check(file, ndx, fname, -1, &st,
itemizing, code, HL_SKIP))
return;
+#endif
if (verbose > 2) {
- rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
- fname, (int)file->mode, (int)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, rdev) < 0) {
rsyserr(FERROR, errno, "mknod %s failed",
}
if (code != FNONE && verbose)
rprintf(code, "%s\n", fname);
- if (preserve_hard_links && IS_HLINKED(file))
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
hard_link_cluster(file, ndx, 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);
}
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 && IS_HLINKED(file)
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file)
&& hard_link_check(file, ndx, fname, statret, &st,
itemizing, code, HL_SKIP))
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)
0, 0, NULL);
}
set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
- if (preserve_hard_links && IS_HLINKED(file))
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
hard_link_cluster(file, ndx, 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;
}
full_fname(fnamecmp));
pretend_missing:
/* pretend the file didn't exist */
- if (preserve_hard_links && IS_HLINKED(file)
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file)
&& hard_link_check(file, ndx, fname, statret, &st,
itemizing, code, HL_SKIP))
return;
+#endif
statret = real_ret = -1;
goto notify_others;
}
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 && IS_HLINKED(file))
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
hard_link_cluster(file, ndx, itemizing, code, -1);
+#endif
return;
}
if (read_batch)
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)
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)
}
#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();
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, NDX_DONE);
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, NDX_DONE);
/* Reduce round-trip lag-time for a useless delay-updates 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);
* 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 (verbose > 2)
- rprintf(FINFO,"generate_files finished\n");
+ rprintf(FINFO, "generate_files finished\n");
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff