extern OFF_T max_size;
extern int io_timeout;
extern int io_error;
+extern int sock_f_out;
extern int ignore_timeout;
extern int protocol_version;
extern int fuzzy_basis;
extern char *backup_dir;
extern char *backup_suffix;
extern int backup_suffix_len;
-
+extern struct file_list *the_file_list;
extern struct filter_list_struct server_filter_list;
+int allowed_lull = 0;
+
static int deletion_count = 0; /* used to implement --max-delete */
int j, dlen, zap_dir, ok;
void *save_filters;
- if (max_delete && deletion_count >= max_delete)
- return -1;
-
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
if (ok) {
if (!(flags & DEL_TERSE))
log_delete(fname, mode);
- deletion_count++;
return 0;
}
- if (errno == ENOENT)
+ if (errno == ENOENT) {
+ deletion_count--;
return 0;
+ }
rsyserr(FERROR, errno, "delete_file: unlink %s failed",
full_fname(fname));
return -1;
zap_dir = (flags & DEL_FORCE_RECURSE || (force_delete && recurse))
&& !(flags & DEL_NO_RECURSE);
- if (dry_run && zap_dir) {
+ 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)
if (ok) {
if (!(flags & DEL_TERSE))
log_delete(fname, mode);
- deletion_count++;
return 0;
}
- if (errno == ENOENT)
+ if (errno == ENOENT) {
+ deletion_count--;
return 0;
+ }
if (!zap_dir || (errno != ENOTEMPTY && errno != EEXIST)) {
rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
full_fname(fname));
return -1;
}
flags |= DEL_FORCE_RECURSE; /* mark subdir dels as not "in the way" */
+ deletion_count--;
dlen = strlcpy(buf, fname, MAXPATHLEN);
save_filters = push_local_filters(buf, dlen);
pop_local_filters(save_filters);
- if (max_delete && deletion_count >= max_delete)
- return -1;
+ if (max_delete && ++deletion_count > max_delete)
+ return 0;
if (do_rmdir(fname) == 0) {
if (!(flags & DEL_TERSE))
log_delete(fname, mode);
- deletion_count++;
} else if (errno != ENOTEMPTY && errno != ENOENT) {
rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
full_fname(fname));
* call will append names onto the end, but the old dir value will be restored
* on exit). */
static void delete_in_dir(struct file_list *flist, char *fbuf,
- struct file_struct *file, int allowed_lull)
+ struct file_struct *file)
{
static int min_depth = MAXPATHLEN, cur_depth = -1;
static void *filt_array[MAXPATHLEN/2+1];
+ static int already_output_warning = 0;
struct file_list *dirlist;
char delbuf[MAXPATHLEN];
STRUCT_STAT st;
rprintf(FINFO, "delete_in_dir(%s)\n", safe_fname(fbuf));
if (allowed_lull)
- maybe_send_keepalive(allowed_lull, flist->count);
+ maybe_send_keepalive();
if (file->dir.depth >= MAXPATHLEN/2+1)
return; /* Impossible... */
- if (max_delete && deletion_count >= max_delete)
- return;
-
if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
+ if (already_output_warning)
+ return;
rprintf(FINFO,
"IO error encountered -- skipping file deletion\n");
- max_delete = -1; /* avoid duplicating the above warning */
+ already_output_warning = 1;
return;
}
/* This deletes any files on the receiving side that are not present on the
* sending side. This is used by --delete-before and --delete-after. */
-static void do_delete_pass(struct file_list *flist, int allowed_lull)
+static void do_delete_pass(struct file_list *flist)
{
char fbuf[MAXPATHLEN];
int j;
+ if (dry_run > 1) /* destination doesn't exist yet */
+ return;
+
for (j = 0; j < flist->count; j++) {
struct file_struct *file = flist->files[j];
if (verbose > 1 && file->flags & FLAG_TOP_DIR)
rprintf(FINFO, "deleting in %s\n", safe_fname(fbuf));
- delete_in_dir(flist, fbuf, file, allowed_lull);
+ delete_in_dir(flist, fbuf, file);
}
}
}
-static void itemize(struct file_struct *file, int statret, STRUCT_STAT *st,
- int32 iflags, int f_out, int ndx)
+void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
+ int32 iflags, uchar fnamecmp_type, char *xname)
{
if (statret == 0) {
if (S_ISREG(file->mode) && file->length != st->st_size)
: S_ISDIR(file->mode) ? !omit_dir_times
: !S_ISLNK(file->mode);
- if ((iflags & ITEM_UPDATING && !keep_time)
+ if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time)
|| (keep_time && file->modtime != st->st_mtime))
iflags |= ITEM_REPORT_TIME;
if (preserve_perms && file->mode != st->st_mode)
iflags |= ITEM_REPORT_GROUP;
}
} else
- iflags |= ITEM_IS_NEW | ITEM_UPDATING;
+ iflags |= ITEM_IS_NEW;
iflags &= 0xffff;
- if ((iflags || verbose > 1) && !read_batch) {
+ if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1
+ || (xname && *xname)) && !read_batch) {
if (protocol_version >= 29) {
if (ndx >= 0)
- write_int(f_out, ndx);
- write_shortint(f_out, iflags);
+ write_int(sock_f_out, ndx);
+ write_shortint(sock_f_out, iflags);
+ if (iflags & ITEM_BASIS_TYPE_FOLLOWS)
+ write_byte(sock_f_out, fnamecmp_type);
+ if (iflags & ITEM_XNAME_FOLLOWS)
+ write_vstring(sock_f_out, xname, strlen(xname));
} else if (ndx >= 0)
- log_recv(file, &stats, iflags);
+ log_item(file, &stats, iflags, xname);
}
}
* The block size is a rounded square root of file length.
*
* The checksum size is determined according to:
- * blocksum_bits = BLOCKSUM_EXP + 2*log2(file_len) - log2(block_len)
+ * blocksum_bits = BLOCKSUM_BIAS + 2*log2(file_len) - log2(block_len)
* provided by Donovan Baarda which gives a probability of rsync
* algorithm corrupting data and falling back using the whole md4
* checksums.
return lowest_j;
}
+void check_for_finished_hlinks(int itemizing, enum logcode code)
+{
+ struct file_struct *file;
+ int ndx;
+
+ while ((ndx = get_hlink_num()) != -1) {
+ if (ndx < 0 || ndx >= the_file_list->count)
+ continue;
+
+ file = the_file_list->files[ndx];
+ if (!file->link_u.links)
+ continue;
+
+ hard_link_cluster(file, ndx, itemizing, code);
+ }
+}
+
+static int phase = 0;
-/* Acts on flist->file's ndx'th item, whose name is fname. If a directory,
+/* Acts on the_file_list->file's ndx'th item, whose name is fname. If a dir,
* make sure it exists, and has the right permissions/timestamp info. For
* all other non-regular files (symlinks, etc.) we create them here. For
* regular files that have changed, we try to find a basis file and then
*
* 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_list *flist,
- struct file_struct *file, int ndx,
+static void recv_generator(char *fname, struct file_struct *file, int ndx,
int itemizing, int maybe_PERMS_REPORT,
- enum logcode code, int allowed_lull,
- int f_out, int f_out_name)
+ enum logcode code, int f_out)
{
static int missing_below = -1, excluded_below = -1;
static char *fuzzy_dirname = NULL;
missing_below = file->dir.depth;
dry_run++;
}
- if (itemizing && f_out != -1)
- itemize(file, statret, &st, 0, f_out, ndx);
+ 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 (!relative_paths || errno != ENOENT
|| create_directory_path(fname, orig_umask) < 0
if (set_perms(fname, file, statret ? NULL : &st, 0)
&& verbose && code && f_out != -1)
rprintf(code, "%s/\n", safe_fname(fname));
- if (delete_during && f_out != -1 && csum_length != SUM_LENGTH
+ if (delete_during && f_out != -1 && !phase && dry_run < 2
&& (file->flags & FLAG_DEL_HERE))
- delete_in_dir(flist, fname, file, allowed_lull);
+ delete_in_dir(the_file_list, fname, file);
return;
}
* required. */
if (strcmp(lnk, file->u.link) == 0) {
if (itemizing) {
- itemize(file, 0, &st, 0,
- f_out, ndx);
+ itemize(file, ndx, 0, &st, 0,
+ 0, NULL);
}
set_perms(fname, file, &st,
maybe_PERMS_REPORT);
} else {
set_perms(fname,file,NULL,0);
if (itemizing) {
- itemize(file, statret, &st, ITEM_UPDATING,
- f_out, ndx);
+ itemize(file, ndx, statret, &st,
+ ITEM_LOCAL_CHANGE, 0, NULL);
}
if (code && verbose) {
rprintf(code, "%s -> %s\n", safe_fname(fname),
} else {
set_perms(fname,file,NULL,0);
if (itemizing) {
- itemize(file, statret, &st, ITEM_UPDATING,
- f_out, ndx);
+ itemize(file, ndx, statret, &st,
+ ITEM_LOCAL_CHANGE, 0, NULL);
}
if (code && verbose) {
rprintf(code, "%s\n",
}
}
} else {
- if (itemizing) {
- itemize(file, statret, &st, 0,
- f_out, ndx);
- }
+ if (itemizing)
+ itemize(file, ndx, statret, &st, 0, 0, NULL);
set_perms(fname, file, &st, maybe_PERMS_REPORT);
}
return;
}
- if (preserve_hard_links && hard_link_check(file, HL_CHECK_MASTER))
+ if (preserve_hard_links && hard_link_check(file, ndx, HL_CHECK_MASTER))
return;
if (!S_ISREG(file->mode)) {
}
}
#ifdef HAVE_LINK
- if (link_dest && match_level == 3
- && do_link(fnamecmpbuf, fname) < 0) {
+ if (link_dest && match_level == 3) {
+ if (hard_link_one(file, ndx, fname, -1, &st,
+ fnamecmpbuf, 1,
+ itemizing && verbose > 1,
+ code) == 0)
+ return;
if (verbose) {
rsyserr(FINFO, errno, "link %s => %s",
full_fname(fnamecmpbuf),
}
if (statret != 0) {
- if (preserve_hard_links && hard_link_check(file, HL_SKIP))
+ if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP))
return;
if (stat_errno == ENOENT)
goto notify_others;
else if (unchanged_file(fnamecmp, file, &st)) {
if (fnamecmp_type == FNAMECMP_FNAME) {
if (itemizing)
- itemize(file, statret, &st, 0, f_out, ndx);
+ itemize(file, ndx, statret, &st, 0, 0, NULL);
set_perms(fname, file, &st, maybe_PERMS_REPORT);
+ if (preserve_hard_links && file->link_u.links)
+ hard_link_cluster(file, ndx, itemizing, code);
return;
}
/* Only --compare-dest gets here. */
if (unchanged_attrs(file, &st)) {
- itemize(file, statret, &st, ITEM_NO_DEST_AND_NO_UPDATE,
- f_out, ndx);
+ itemize(file, ndx, statret, &st,
+ ITEM_NO_DEST_AND_NO_UPDATE, 0, NULL);
return;
}
}
statret = 0;
}
- if (dry_run || read_batch || whole_file > 0)
+ if (dry_run || read_batch || whole_file)
goto notify_others;
if (fuzzy_basis) {
full_fname(fnamecmp));
pretend_missing:
/* pretend the file didn't exist */
- if (preserve_hard_links && hard_link_check(file, HL_SKIP))
+ if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP))
return;
statret = -1;
goto notify_others;
}
- if (inplace && make_backups) {
+ if (inplace && make_backups && fnamecmp_type == FNAMECMP_FNAME) {
if (!(backupptr = get_backup_name(fname))) {
close(fd);
return;
notify_others:
write_int(f_out, ndx);
if (itemizing) {
- int iflags = ITEM_UPDATING;
+ int iflags = ITEM_TRANSFER;
if (always_checksum)
iflags |= ITEM_REPORT_CHECKSUM;
if (fnamecmp_type != FNAMECMP_FNAME)
- iflags |= ITEM_USING_ALT_BASIS;
- itemize(file, statret, &st, iflags, f_out, -1);
- }
- if (f_out_name >= 0) {
- write_byte(f_out_name, fnamecmp_type);
- if (fnamecmp_type == FNAMECMP_FUZZY) {
- uchar lenbuf[3], *lb = lenbuf;
- int len = strlen(fuzzy_file->basename);
- if (len > 0x7F) {
-#if MAXPATHLEN > 0x7FFF
- *lb++ = len / 0x10000 + 0x80;
- *lb++ = len / 0x100;
-#else
- *lb++ = len / 0x100 + 0x80;
-#endif
- }
- *lb = len;
- write_buf(f_out_name, (char*)lenbuf, lb - lenbuf + 1);
- write_buf(f_out_name, fuzzy_file->basename, len);
- }
+ iflags |= ITEM_BASIS_TYPE_FOLLOWS;
+ if (fnamecmp_type == FNAMECMP_FUZZY)
+ iflags |= ITEM_XNAME_FOLLOWS;
+ itemize(file, -1, statret, &st, iflags, fnamecmp_type,
+ fuzzy_file ? fuzzy_file->basename : NULL);
}
- if (dry_run || read_batch)
+ if (dry_run) {
+ if (preserve_hard_links && file->link_u.links)
+ hard_link_cluster(file, ndx, itemizing, code);
+ return;
+ }
+ if (read_batch)
return;
- if (statret != 0 || whole_file > 0) {
+ if (statret != 0 || whole_file) {
write_sum_head(f_out, NULL);
return;
}
}
-void generate_files(int f_out, struct file_list *flist, char *local_name,
- int f_out_name)
+void generate_files(int f_out, struct file_list *flist, char *local_name)
{
- int i;
- int phase = 0;
+ int i, lull_mod;
char fbuf[MAXPATHLEN];
int itemizing, maybe_PERMS_REPORT;
enum logcode code;
int need_retouch_dir_perms = 0;
int save_only_existing = only_existing;
int save_opt_ignore_existing = opt_ignore_existing;
- int allowed_lull = read_batch ? 0 : (io_timeout + 1) / 2;
- int lull_mod = allowed_lull * 5;
+
+ allowed_lull = read_batch ? 0 : (io_timeout + 1) / 2;
+ lull_mod = allowed_lull * 5;
if (protocol_version >= 29) {
itemizing = 1;
}
if (delete_before && !local_name && flist->count > 0)
- do_delete_pass(flist, allowed_lull);
+ do_delete_pass(flist);
+ if (whole_file < 0)
+ whole_file = 0;
if (verbose >= 2) {
rprintf(FINFO, "delta-transmission %s\n",
- whole_file > 0
+ whole_file
? "disabled for local transfer or --whole-file"
: "enabled");
}
for (i = 0; i < flist->count; i++) {
struct file_struct *file = flist->files[i];
- struct file_struct copy;
if (!file->basename)
continue;
+ recv_generator(local_name ? local_name : f_name_to(file, fbuf),
+ file, i, itemizing, maybe_PERMS_REPORT, code,
+ f_out);
+
/* We need to ensure that any dirs we create have writeable
* permissions during the time we are putting files within
* them. This is then fixed after the transfer is done. */
if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)) {
- copy = *file;
- copy.mode |= S_IWUSR; /* user write */
- file = ©
+ int mode = file->mode | S_IWUSR; /* user write */
+ char *fname = local_name ? local_name : fbuf;
+ if (do_chmod(fname, mode & CHMOD_BITS) < 0) {
+ rsyserr(FERROR, errno,
+ "failed to modify permissions on %s",
+ full_fname(fname));
+ }
need_retouch_dir_perms = 1;
}
- recv_generator(local_name ? local_name : f_name_to(file, fbuf),
- flist, file, i, itemizing, maybe_PERMS_REPORT,
- code, allowed_lull, f_out, f_out_name);
+ if (preserve_hard_links)
+ check_for_finished_hlinks(itemizing, code);
if (allowed_lull && !(i % lull_mod))
- maybe_send_keepalive(allowed_lull, flist->count);
+ maybe_send_keepalive();
}
- recv_generator(NULL, NULL, NULL, 0, 0, 0, code, 0, -1, -1);
+ recv_generator(NULL, NULL, 0, 0, 0, code, -1);
if (delete_during)
- delete_in_dir(NULL, NULL, NULL, 0);
+ delete_in_dir(NULL, NULL, NULL);
phase++;
csum_length = SUM_LENGTH;
/* files can cycle through the system more than once
* to catch initial checksum errors */
- while ((i = get_redo_num()) != -1) {
+ while ((i = get_redo_num(itemizing, code)) != -1) {
struct file_struct *file = flist->files[i];
recv_generator(local_name ? local_name : f_name_to(file, fbuf),
- flist, file, i, itemizing, maybe_PERMS_REPORT,
- code, allowed_lull, f_out, f_out_name);
+ file, i, itemizing, maybe_PERMS_REPORT, code,
+ f_out);
}
phase++;
write_int(f_out, -1);
/* Read post-redo-phase MSG_DONE and any prior messages. */
- get_redo_num();
-
- if (preserve_hard_links)
- do_hard_links(allowed_lull, flist->count);
+ get_redo_num(itemizing, code);
if (delete_after && !local_name && flist->count > 0)
- do_delete_pass(flist, allowed_lull);
+ do_delete_pass(flist);
if ((need_retouch_dir_perms || need_retouch_dir_times)
&& !list_only && !local_name && !dry_run) {
if (!need_retouch_dir_times && file->mode & S_IWUSR)
continue;
recv_generator(local_name ? local_name : f_name(file),
- flist, file, i, itemizing,
- maybe_PERMS_REPORT, code, allowed_lull,
- -1, -1);
+ file, i, itemizing, maybe_PERMS_REPORT,
+ code, -1);
if (allowed_lull && !(j++ % lull_mod))
- maybe_send_keepalive(allowed_lull, flist->count);
+ maybe_send_keepalive();
}
}
- recv_generator(NULL, NULL, NULL, 0, 0, 0, code, 0, -1, -1);
+ recv_generator(NULL, NULL, 0, 0, 0, code, -1);
+
+ if (max_delete > 0 && deletion_count > max_delete) {
+ rprintf(FINFO,
+ "Deletions stopped due to --max-delete limit (%d skipped)\n",
+ deletion_count - max_delete);
+ io_error |= IOERR_DEL_LIMIT;
+ }
if (verbose > 2)
rprintf(FINFO,"generate_files finished\n");
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff