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));
{
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;
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;
}
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];
void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
- int32 iflags, char *hlink)
+ int32 iflags, uchar fnamecmp_type, char *xname)
{
if (statret == 0) {
if (S_ISREG(file->mode) && file->length != st->st_size)
&& st->st_gid != file->gid)
iflags |= ITEM_REPORT_GROUP;
}
- } else {
+ } else
iflags |= ITEM_IS_NEW;
- if (!(iflags & (ITEM_HARD_LINKED|ITEM_LOCAL_CHANGE)))
- iflags |= ITEM_TRANSFER;
- }
iflags &= 0xffff;
if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1
- || (hlink && *hlink)) && !read_batch) {
+ || (xname && *xname)) && !read_batch) {
if (protocol_version >= 29) {
if (ndx >= 0)
write_int(sock_f_out, ndx);
- /* XXX Temorary compatibility hack */
- if (iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE))
- iflags |= ITEM_REPORT_XATTRS; /* ITEM_UPDATE */
write_shortint(sock_f_out, iflags);
- if (hlink)
- write_vstring(sock_f_out, hlink, strlen(hlink));
+ 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_item(file, &stats, iflags, hlink);
+ log_item(file, &stats, iflags, xname);
}
}
* modification-time repair. */
static void recv_generator(char *fname, struct file_struct *file, int ndx,
int itemizing, int maybe_PERMS_REPORT,
- enum logcode code, 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;
}
if (itemizing && f_out != -1) {
itemize(file, ndx, statret, &st,
- statret ? ITEM_LOCAL_CHANGE : 0, NULL);
+ statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
}
if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) {
if (!relative_paths || errno != ENOENT
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 && !phase
+ if (delete_during && f_out != -1 && !phase && dry_run < 2
&& (file->flags & FLAG_DEL_HERE))
delete_in_dir(the_file_list, fname, file);
return;
if (strcmp(lnk, file->u.link) == 0) {
if (itemizing) {
itemize(file, ndx, 0, &st, 0,
- NULL);
+ 0, NULL);
}
set_perms(fname, file, &st,
maybe_PERMS_REPORT);
set_perms(fname,file,NULL,0);
if (itemizing) {
itemize(file, ndx, statret, &st,
- ITEM_LOCAL_CHANGE, NULL);
+ ITEM_LOCAL_CHANGE, 0, NULL);
}
if (code && verbose) {
rprintf(code, "%s -> %s\n", safe_fname(fname),
set_perms(fname,file,NULL,0);
if (itemizing) {
itemize(file, ndx, statret, &st,
- ITEM_LOCAL_CHANGE, NULL);
+ ITEM_LOCAL_CHANGE, 0, NULL);
}
if (code && verbose) {
rprintf(code, "%s\n",
}
} else {
if (itemizing)
- itemize(file, ndx, statret, &st, 0, NULL);
+ itemize(file, ndx, statret, &st, 0, 0, NULL);
set_perms(fname, file, &st, maybe_PERMS_REPORT);
}
return;
else if (unchanged_file(fnamecmp, file, &st)) {
if (fnamecmp_type == FNAMECMP_FNAME) {
if (itemizing)
- itemize(file, ndx, statret, &st, 0, NULL);
+ 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);
/* Only --compare-dest gets here. */
if (unchanged_attrs(file, &st)) {
itemize(file, ndx, statret, &st,
- ITEM_NO_DEST_AND_NO_UPDATE, NULL);
+ ITEM_NO_DEST_AND_NO_UPDATE, 0, NULL);
return;
}
}
goto notify_others;
}
- if (inplace && make_backups) {
+ if (inplace && make_backups && fnamecmp_type == FNAMECMP_FNAME) {
if (!(backupptr = get_backup_name(fname))) {
close(fd);
return;
if (always_checksum)
iflags |= ITEM_REPORT_CHECKSUM;
if (fnamecmp_type != FNAMECMP_FNAME)
- iflags |= ITEM_USING_ALT_BASIS;
- itemize(file, -1, statret, &st, iflags, NULL);
- }
- if (f_out_name >= 0) {
- write_byte(f_out_name, fnamecmp_type);
- if (fnamecmp_type == FNAMECMP_FUZZY) {
- write_vstring(f_out_name, fuzzy_file->basename,
- strlen(fuzzy_file->basename));
- }
+ 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) {
}
-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, lull_mod;
char fbuf[MAXPATHLEN];
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),
- file, i, itemizing, maybe_PERMS_REPORT, code,
- f_out, f_out_name);
if (preserve_hard_links)
check_for_finished_hlinks(itemizing, code);
if (allowed_lull && !(i % lull_mod))
maybe_send_keepalive();
}
- recv_generator(NULL, NULL, 0, 0, 0, code, -1, -1);
+ recv_generator(NULL, NULL, 0, 0, 0, code, -1);
if (delete_during)
delete_in_dir(NULL, NULL, NULL);
struct file_struct *file = flist->files[i];
recv_generator(local_name ? local_name : f_name_to(file, fbuf),
file, i, itemizing, maybe_PERMS_REPORT, code,
- f_out, f_out_name);
+ f_out);
}
phase++;
continue;
recv_generator(local_name ? local_name : f_name(file),
file, i, itemizing, maybe_PERMS_REPORT,
- code, -1, -1);
+ code, -1);
if (allowed_lull && !(j++ % lull_mod))
maybe_send_keepalive();
}
}
- recv_generator(NULL, NULL, 0, 0, 0, code, -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