If there is no lchown(), don't try to set the user & group of a symlink.

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index 9fe5f62..80b7096 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -27,6 +27,8 @@ extern int dry_run;
 extern int am_server;
 extern int am_daemon;
 extern int protocol_version;
+extern int make_backups;
+extern struct stats stats;
 
 
 /**
@@ -62,41 +64,43 @@ static struct sum_struct *receive_sums(int f)
        int i;
        OFF_T offset = 0;
 
-       s = new(struct sum_struct);
-       if (!s) out_of_memory("receive_sums");
+       if (!(s = new(struct sum_struct)))
+               out_of_memory("receive_sums");
 
        read_sum_head(f, s);
 
        s->sums = NULL;
 
        if (verbose > 3) {
-               rprintf(FINFO, "count=%ld n=%u rem=%u\n",
-                       (long)s->count, s->blength, s->remainder);
+               rprintf(FINFO, "count=%.0f n=%ld rem=%ld\n",
+                       (double)s->count, (long)s->blength, (long)s->remainder);
        }
 
        if (s->count == 0)
                return(s);
 
-       s->sums = new_array(struct sum_buf, s->count);
-       if (!s->sums) out_of_memory("receive_sums");
+       if (!(s->sums = new_array(struct sum_buf, s->count)))
+               out_of_memory("receive_sums");
 
-       for (i = 0; i < (int) s->count; i++) {
+       for (i = 0; i < (int)s->count; i++) {
                s->sums[i].sum1 = read_int(f);
                read_buf(f, s->sums[i].sum2, s->s2length);
 
                s->sums[i].offset = offset;
-               s->sums[i].i = i;
+               s->sums[i].flags = 0;
 
-               if (i == (int) s->count-1 && s->remainder != 0) {
+               if (i == (int)s->count-1 && s->remainder != 0)
                        s->sums[i].len = s->remainder;
-               } else {
+               else
                        s->sums[i].len = s->blength;
-               }
                offset += s->sums[i].len;
 
-               if (verbose > 3)
-                       rprintf(FINFO, "chunk[%d] len=%d offset=%.0f sum1=%08x\n",
-                               i, s->sums[i].len, (double)s->sums[i].offset, s->sums[i].sum1);
+               if (verbose > 3) {
+                       rprintf(FINFO,
+                               "chunk[%d] len=%d offset=%.0f sum1=%08x\n",
+                               i, s->sums[i].len, (double)s->sums[i].offset,
+                               s->sums[i].sum1);
+               }
        }
 
        s->flength = offset;
@@ -112,12 +116,12 @@ void send_files(struct file_list *flist, int f_out, int f_in)
        struct sum_struct *s;
        struct map_struct *mbuf = NULL;
        STRUCT_STAT st;
-       char fname[MAXPATHLEN];
+       char *fname2, fname[MAXPATHLEN];
        int i;
        struct file_struct *file;
        int phase = 0;
-       extern struct stats stats;
        struct stats initial_stats;
+       int save_make_backups = make_backups;
        int j;
 
        if (verbose > 2)
@@ -134,6 +138,9 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                                write_int(f_out, -1);
                                if (verbose > 2)
                                        rprintf(FINFO, "send_files phase=%d\n", phase);
+                               /* For inplace: redo phase turns off the backup
+                                * flag so that we do a regular inplace send. */
+                               make_backups = 0;
                                continue;
                        }
                        break;
@@ -158,23 +165,21 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                                fname[offset++] = '/';
                } else
                        offset = 0;
-               f_name_to(file, fname + offset);
+               fname2 = f_name_to(file, fname + offset);
 
                if (verbose > 2)
                        rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
 
                if (dry_run) {
-                       if (!am_server && verbose) {
-                               rprintf(FINFO, "%s\n", fname+offset);
-                       }
+                       if (!am_server && verbose) /* log the transfer */
+                               rprintf(FINFO, "%s\n", safe_fname(fname2));
                        write_int(f_out, i);
                        continue;
                }
 
                initial_stats = stats;
 
-               s = receive_sums(f_in);
-               if (!s) {
+               if (!(s = receive_sums(f_in))) {
                        io_error |= IOERR_GENERAL;
                        rprintf(FERROR, "receive_sums failed\n");
                        return;
@@ -208,23 +213,28 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                        return;
                }
 
-               mbuf = st.st_size ? map_file(fd, st.st_size) : NULL;
+               if (st.st_size) {
+                       OFF_T map_size = MAX((OFF_T)s->blength * 3, MAX_MAP_SIZE);
+                       mbuf = map_file(fd, st.st_size, map_size, s->blength);
+               } else
+                       mbuf = NULL;
 
                if (verbose > 2) {
                        rprintf(FINFO, "send_files mapped %s of size %.0f\n",
-                               fname, (double)st.st_size);
+                               safe_fname(fname), (double)st.st_size);
                }
 
                write_int(f_out, i);
                write_sum_head(f_out, s);
 
-               if (verbose > 2)
-                       rprintf(FINFO, "calling match_sums %s\n", fname);
-
-               if (!am_server && verbose) {
-                       rprintf(FINFO, "%s\n", fname+offset);
+               if (verbose > 2) {
+                       rprintf(FINFO, "calling match_sums %s\n",
+                               safe_fname(fname));
                }
 
+               if (!am_server && verbose) /* log the transfer */
+                       rprintf(FINFO, "%s\n", safe_fname(fname2));
+
                set_compression(fname);
 
                match_sums(f_out, s, mbuf, st.st_size);
@@ -243,9 +253,12 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 
                free_sums(s);
 
-               if (verbose > 2)
-                       rprintf(FINFO, "sender finished %s\n", fname);
+               if (verbose > 2) {
+                       rprintf(FINFO, "sender finished %s\n",
+                               safe_fname(fname));
+               }
        }
+       make_backups = save_make_backups;
 
        if (verbose > 2)
                rprintf(FINFO, "send files finished\n");