diff options
author | Wayne Davison <wayned@samba.org> | 2008-08-01 18:03:57 -0700 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2008-08-01 18:03:57 -0700 |
commit | 459abd75f51b498c2ae354a3256532f59b3abc77 (patch) | |
tree | 6b0ea40c5517c69a562d0ac43f4efbb6d9023f6f /receiver.c | |
parent | 342bfb5e23ebb372e0b1230f8124a4312f8a66d8 (diff) | |
download | android_external_rsync-459abd75f51b498c2ae354a3256532f59b3abc77.tar.gz android_external_rsync-459abd75f51b498c2ae354a3256532f59b3abc77.tar.bz2 android_external_rsync-459abd75f51b498c2ae354a3256532f59b3abc77.zip |
Properly handle a failure to create a partial directory, which is
especially important for --delay-updates, particularly when
--remove-source-files was also specified.
Diffstat (limited to 'receiver.c')
-rw-r--r-- | receiver.c | 23 |
1 files changed, 15 insertions, 8 deletions
@@ -702,23 +702,30 @@ int recv_files(int f_in, char *local_name) do_unlink(partialptr); handle_partial_dir(partialptr, PDIR_DELETE); } - } else if (keep_partial && partialptr - && handle_partial_dir(partialptr, PDIR_CREATE)) { - if (!finish_transfer(partialptr, fnametmp, fnamecmp, NULL, - file, recv_ok, !partial_dir)) + } else if (keep_partial && partialptr) { + if (!handle_partial_dir(partialptr, PDIR_CREATE)) { + rprintf(FERROR, + "Unable to create partial-dir for %s -- discarding %s.\n", + local_name ? local_name : f_name(file, NULL), + recv_ok ? "completed file" : "partial file"); + do_unlink(fnametmp); + recv_ok = -1; + } else if (!finish_transfer(partialptr, fnametmp, fnamecmp, NULL, + file, recv_ok, !partial_dir)) recv_ok = -1; else if (delay_updates && recv_ok) { bitbag_set_bit(delayed_bits, ndx); recv_ok = 2; - } - } else { - partialptr = NULL; + } else + partialptr = NULL; + } else do_unlink(fnametmp); - } cleanup_disable(); switch (recv_ok) { + case 2: + break; case 1: if (remove_source_files || inc_recurse || (preserve_hard_links && F_IS_HLINKED(file))) |