extern char *tmpdir;
extern char *partial_dir;
extern char *basis_dir[];
+extern int basis_dir_cnt;
extern int make_backups;
extern int do_progress;
extern char *backup_dir;
extern struct exclude_list_struct server_exclude_list;
-static void delete_one(char *fn, int is_dir)
-{
- if (!is_dir) {
- if (robust_unlink(fn) != 0) {
- rsyserr(FERROR, errno, "delete_one: unlink %s failed",
- full_fname(fn));
- } else if (verbose)
- rprintf(FINFO, "deleting %s\n", safe_fname(fn));
- } else {
- if (do_rmdir(fn) != 0) {
- if (errno != ENOTEMPTY && errno != EEXIST) {
- rsyserr(FERROR, errno,
- "delete_one: rmdir %s failed",
- full_fname(fn));
- }
- } else if (verbose) {
- rprintf(FINFO, "deleting directory %s\n",
- safe_fname(fn));
- }
- }
-}
-
-
static int is_backup_file(char *fn)
{
int k = strlen(fn) - backup_suffix_len;
}
for (j = 0; j < flist->count; j++) {
- if (!(flist->files[j]->flags & FLAG_TOP_DIR)
+ if (!(flist->files[j]->flags & FLAG_DEL_START)
|| !S_ISDIR(flist->files[j]->mode))
continue;
rprintf(FINFO, "deleting %s\n",
safe_fname(f));
}
- } else
- delete_one(f, S_ISDIR(mode) != 0);
+ } else {
+ delete_file(f, S_ISDIR(mode)
+ ? DEL_DIR | DEL_RECURSE : 0);
+ }
deletion_count++;
}
}
read_sum_head(f_in, &sum);
if (fd_r >= 0 && size_r > 0) {
- OFF_T map_size = MAX((OFF_T)sum.blength * 2, 16*1024);
- mapbuf = map_file(fd_r, size_r, map_size, sum.blength);
+ int32 read_size = MAX(sum.blength * 2, 16*1024);
+ mapbuf = map_file(fd_r, size_r, read_size, sum.blength);
if (verbose > 2) {
rprintf(FINFO, "recv mapped %s of size %.0f\n",
safe_fname(fname_r), (double)size_r);
if (verbose > 2)
rprintf(FINFO, "recv_files phase=%d\n", phase);
send_msg(MSG_DONE, "", 0);
- if (keep_partial)
+ if (keep_partial && !partial_dir)
make_backups = 0; /* prevents double backup */
continue;
}
case FNAMECMP_BACKUP:
fnamecmp = get_backup_name(fname);
break;
- case FNAMECMP_BASIS_DIR:
default:
+ if (j >= basis_dir_cnt) {
+ rprintf(FERROR,
+ "invalid basis_dir index: %d.\n",
+ j);
+ exit_cleanup(RERR_PROTOCOL);
+ }
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
basis_dir[j], fname);
fnamecmp = fnamecmpbuf;
exit_cleanup(RERR_FILEIO);
}
- if (recv_ok || inplace)
- finish_transfer(fname, fnametmp, file, recv_ok);
- else if (keep_partial && partialptr
- && handle_partial_dir(partialptr, PDIR_CREATE))
- finish_transfer(partialptr, fnametmp, file, 0);
- else {
+ if (recv_ok || inplace) {
+ finish_transfer(fname, fnametmp, file, recv_ok, 1);
+ if (partialptr != fname && fnamecmp == partialptr) {
+ do_unlink(partialptr);
+ handle_partial_dir(partialptr, PDIR_DELETE);
+ }
+ } else if (keep_partial && partialptr
+ && handle_partial_dir(partialptr, PDIR_CREATE)) {
+ finish_transfer(partialptr, fnametmp, file, recv_ok,
+ !partial_dir);
+ } else {
partialptr = NULL;
do_unlink(fnametmp);
}
- if (partialptr != fname && fnamecmp == partialptr && recv_ok) {
- do_unlink(partialptr);
- handle_partial_dir(partialptr, PDIR_DELETE);
- }
-
cleanup_disable();
if (!recv_ok) {