Document --delete-before and --delete's new "during" behavior.

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index 4a22581..6c51a18 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -34,6 +34,7 @@ extern int preserve_hard_links;
 extern int preserve_perms;
 extern int preserve_uid;
 extern int preserve_gid;
+extern int delete_during;
 extern int update_only;
 extern int opt_ignore_existing;
 extern int inplace;
@@ -117,7 +118,7 @@ static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
  *
  * This might be made one of several selectable heuristics.
  */
-static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
+static void sum_sizes_sqroot(struct sum_struct *sum, int64 len)
 {
        int32 blength;
        int s2length;
@@ -128,7 +129,7 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
                blength = BLOCK_SIZE;
        else {
                int32 c;
-               uint64 l;
+               int64 l;
                int cnt;
                for (c = 1, l = len, cnt = 0; l >>= 2; c <<= 1, cnt++) {}
                if (cnt >= 31 || c >= MAX_BLOCK_SIZE)
@@ -137,7 +138,7 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
                    blength = 0;
                    do {
                            blength |= c;
-                           if (len < (uint64)blength * blength)
+                           if (len < (int64)blength * blength)
                                    blength &= ~c;
                            c >>= 1;
                    } while (c >= 8);   /* round to multiple of 8 */
@@ -151,7 +152,7 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
                s2length = SUM_LENGTH;
        } else {
                int32 c;
-               uint64 l;
+               int64 l;
                int b = BLOCKSUM_BIAS;
                for (l = len; l >>= 1; b += 2) {}
                for (c = blength; c >>= 1 && b; b--) {}
@@ -233,7 +234,8 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy)
  * @note This comment was added later by mbp who was trying to work it
  * out.  It might be wrong.
  */
-static void recv_generator(char *fname, struct file_struct *file, int i,
+static void recv_generator(char *fname, struct file_list *flist,
+                          struct file_struct *file, int i,
                           int f_out, int f_out_name)
 {
        int fd = -1, f_copy = -1;
@@ -292,18 +294,15 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
                 * to prepare appropriately.  If there is already a
                 * file of that name and it is *not* a directory, then
                 * we need to delete it.  If it doesn't exist, then
-                * recursively create it. */
-
-               if (dry_run)
-                       return; /* TODO: causes inaccuracies -- fix */
+                * (perhaps recursively) create it. */
                if (statret == 0 && !S_ISDIR(st.st_mode)) {
                        delete_file(fname, DEL_TERSE);
                        statret = -1;
                }
                if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) {
-                       if (!(relative_paths && errno == ENOENT
-                           && create_directory_path(fname, orig_umask) == 0
-                           && do_mkdir(fname, file->mode) == 0)) {
+                       if (!relative_paths || errno != ENOENT
+                           || create_directory_path(fname, orig_umask) < 0
+                           || do_mkdir(fname, file->mode) < 0) {
                                rsyserr(FERROR, errno,
                                        "recv_generator: mkdir %s failed",
                                        full_fname(fname));
@@ -314,6 +313,9 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
                if (set_perms(fname, file, statret ? NULL : &st, 0)
                    && verbose && f_out != -1)
                        rprintf(FINFO, "%s/\n", safe_fname(fname));
+               if (delete_during && f_out != -1
+                   && (file->flags & FLAG_DEL_START))
+                       delete_in_dir(flist, fname);
                return;
        } else if (max_size && file->length > max_size) {
                if (verbose > 1)
@@ -644,7 +646,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
                }
 
                recv_generator(local_name ? local_name : f_name_to(file, fbuf),
-                              file, i, f_out, f_out_name);
+                              flist, file, i, f_out, f_out_name);
        }
 
        phase++;
@@ -661,7 +663,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
        while ((i = get_redo_num()) != -1) {
                struct file_struct *file = flist->files[i];
                recv_generator(local_name ? local_name : f_name_to(file, fbuf),
-                              file, i, f_out, f_out_name);
+                              flist, file, i, f_out, f_out_name);
        }
 
        phase++;
@@ -683,7 +685,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
                if (!file->basename || !S_ISDIR(file->mode))
                        continue;
                recv_generator(local_name ? local_name : f_name(file),
-                              file, i, -1, -1);
+                              flist, file, i, -1, -1);
        }
 
        if (verbose > 2)