extern int protocol_version;
extern int fuzzy_basis;
extern int always_checksum;
+extern int checksum_len;
extern char *partial_dir;
extern char *basis_dir[];
extern int compare_dest;
static int deletion_count = 0; /* used to implement --max-delete */
+/* For calling delete_file() */
+#define DEL_FORCE_RECURSE (1<<1) /* recurse even w/o --force */
+#define DEL_TERSE (1<<3)
+
static int is_backup_file(char *fn)
{
/* Delete a file or directory. If DEL_FORCE_RECURSE is set in the flags, or if
- * force_delete is set, this will delete recursively as long as DEL_NO_RECURSE
- * is not set in the flags. */
+ * force_delete is set, this will delete recursively.
+ *
+ * Note that fname must point to a MAXPATHLEN buffer if the mode indicates it's
+ * a directory! (The buffer is used for recursion, but returned unchanged.)
+ */
static int delete_item(char *fname, int mode, int flags)
{
struct file_list *dirlist;
- char buf[MAXPATHLEN];
int j, dlen, zap_dir, ok;
+ unsigned remainder;
void *save_filters;
+ char *p;
if (!S_ISDIR(mode)) {
if (max_delete && ++deletion_count > max_delete)
return -1;
}
- zap_dir = (flags & DEL_FORCE_RECURSE || (force_delete && recurse))
- && !(flags & DEL_NO_RECURSE);
+ zap_dir = flags & DEL_FORCE_RECURSE || (force_delete && recurse);
if ((max_delete && ++deletion_count > max_delete)
|| (dry_run && zap_dir)) {
ok = 0;
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);
+ dlen = strlen(fname);
+ save_filters = push_local_filters(fname, dlen);
+
+ dirlist = get_dirlist(fname, dlen, 0);
+
+ p = fname + dlen;
+ if (dlen != 1 || *fname != '/')
+ *p++ = '/';
+ remainder = MAXPATHLEN - (p - fname);
- dirlist = get_dirlist(buf, dlen, 0);
for (j = dirlist->count; j--; ) {
struct file_struct *fp = dirlist->files[j];
if (fp->flags & FLAG_MOUNT_POINT)
continue;
- f_name_to(fp, buf);
- delete_item(buf, fp->mode, flags & ~DEL_TERSE);
+ strlcpy(p, fp->basename, remainder);
+ delete_item(fname, fp->mode, flags & ~DEL_TERSE);
}
flist_free(dirlist);
+ fname[dlen] = '\0';
+
pop_local_filters(save_filters);
if (max_delete && ++deletion_count > max_delete)
delete_in_dir(flist, fbuf, file);
}
+ delete_in_dir(NULL, NULL, NULL);
+
if (do_progress && !am_server)
rprintf(FINFO, " \r");
}
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, protocol_version < 21 ? 2
- : MD4_SUM_LENGTH) == 0;
+ return memcmp(sum, file->u.sum, checksum_len) == 0;
}
if (size_only)
* regular files that have changed, we try to find a basis file and then
* start sending checksums.
*
+ * When fname is non-null, it must point to a MAXPATHLEN buffer!
+ *
* 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,
S_ISDIR(file->mode)) < 0) {
if (S_ISDIR(file->mode))
excluded_below = file->dir.depth;
- skipping:
+ skipping:
if (verbose) {
rprintf(FINFO,
"skipping server-excluded file \"%s\"\n",
if (statret != 0
|| (st.st_mode & ~CHMOD_BITS) != (file->mode & ~CHMOD_BITS)
|| st.st_rdev != file->u.rdev) {
- if (delete_item(fname, st.st_mode, DEL_TERSE) < 0)
+ if (statret == 0
+ && delete_item(fname, st.st_mode, DEL_TERSE) < 0)
return;
if (preserve_hard_links && file->link_u.links
&& hard_link_check(file, ndx, fname, -1, &st,
else if (fnamecmp_type == FNAMECMP_FUZZY)
;
else if (unchanged_file(fnamecmp, file, &st)) {
+ if (partialptr) {
+ do_unlink(partialptr);
+ handle_partial_dir(partialptr, PDIR_DELETE);
+ }
if (fnamecmp_type == FNAMECMP_FNAME) {
if (itemizing) {
itemize(file, ndx, real_ret, &real_st,
return;
}
-prepare_to_open:
+ prepare_to_open:
if (partialptr) {
st = partial_st;
fnamecmp = partialptr;
if (fd == -1) {
rsyserr(FERROR, errno, "failed to open %s, continuing",
full_fname(fnamecmp));
- pretend_missing:
+ pretend_missing:
/* pretend the file didn't exist */
if (preserve_hard_links && file->link_u.links
&& hard_link_check(file, ndx, fname, statret, &st,
if (verbose > 2)
rprintf(FINFO, "generating and sending sums for %d\n", ndx);
-notify_others:
+ notify_others:
write_int(f_out, ndx);
if (itemizing) {
int iflags = ITEM_TRANSFER;
if (!file->basename)
continue;
- recv_generator(local_name ? local_name : f_name_to(file, fbuf),
- file, i, itemizing, maybe_PERMS_REPORT, code,
- f_out);
+ if (local_name)
+ strlcpy(fbuf, local_name, sizeof fbuf);
+ else
+ f_name_to(file, fbuf);
+ recv_generator(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
* to catch initial checksum errors */
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),
- file, i, itemizing, maybe_PERMS_REPORT, code,
- f_out);
+ if (local_name)
+ strlcpy(fbuf, local_name, sizeof fbuf);
+ else
+ f_name_to(file, fbuf);
+ recv_generator(fbuf, file, i, itemizing, maybe_PERMS_REPORT,
+ code, f_out);
}
phase++;
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff