Made the types used in the sum_buf and sum_struct structures consistent

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index f9a18d2..b7ebbe1 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -42,10 +42,16 @@ void read_sum_head(int f, struct sum_struct *sum)
 
        sum->count = read_int(f);
        sum->blength = read_int(f);
-       if (protocol_version < 27)
+       if (protocol_version < 27) {
                sum->s2length = csum_length;
-       else
+       } else {
                sum->s2length = read_int(f);
+               if (sum->s2length > MD4_SUM_LENGTH) {
+                       rprintf(FERROR, "Invalid checksum length %ld\n",
+                           (long)sum->s2length);
+                       exit_cleanup(RERR_PROTOCOL);
+               }
+       }
        sum->remainder = read_int(f);
 }
 
@@ -58,22 +64,22 @@ static struct sum_struct *receive_sums(int f)
        int i;
        OFF_T offset = 0;
 
-       s = (struct sum_struct *)malloc(sizeof(*s));
+       s = new(struct sum_struct);
        if (!s) out_of_memory("receive_sums");
 
        read_sum_head(f, s);
 
        s->sums = NULL;
 
-       if (verbose > 3)
-               rprintf(FINFO, "count=%ld n=%ld rem=%ld\n",
-                       (long) s->count, (long) s->blength,
-                       (long) s->remainder);
+       if (verbose > 3) {
+               rprintf(FINFO, "count=%ld n=%u rem=%u\n",
+                       (long)s->count, s->blength, s->remainder);
+       }
 
        if (s->count == 0)
                return(s);
 
-       s->sums = (struct sum_buf *)malloc(sizeof(s->sums[0])*s->count);
+       s->sums = new_array(struct sum_buf, s->count);
        if (!s->sums) out_of_memory("receive_sums");
 
        for (i = 0; i < (int) s->count; i++) {
@@ -114,13 +120,13 @@ void send_files(struct file_list *flist, int f_out, int f_in)
        int phase = 0;
        extern struct stats stats;
        struct stats initial_stats;
-       extern int write_batch;   /* dw */
-       extern int read_batch;    /* dw */
-       int checksums_match;   /* dw */
-       int buff_len;  /* dw */
-       char buff[CHUNK_SIZE];    /* dw */
-       int j;   /* dw */
-       int done;   /* dw */
+       extern int write_batch;
+       extern int read_batch;
+       int checksums_match;
+       int buff_len;
+       char buff[CHUNK_SIZE];
+       int j;
+       int done;
 
        if (verbose > 2)
                rprintf(FINFO, "send_files starting\n");
@@ -156,7 +162,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                if (file->basedir) {
                        strlcpy(fname, file->basedir, MAXPATHLEN);
                        if (strlen(fname) == MAXPATHLEN-1) {
-                               io_error = 1;
+                               io_error |= IOERR_GENERAL;
                                rprintf(FERROR, "send_files failed on long-named directory %s\n",
                                        full_fname(fname));
                                return;
@@ -164,7 +170,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                        strlcat(fname, "/", MAXPATHLEN);
                        offset = strlen(file->basedir)+1;
                }
-               strlcat(fname, f_name(file), MAXPATHLEN);
+               f_name_to(file, fname + offset, MAXPATHLEN - offset);
 
                if (verbose > 2)
                        rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
@@ -181,7 +187,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 
                s = receive_sums(f_in);
                if (!s) {
-                       io_error = 1;
+                       io_error |= IOERR_GENERAL;
                        rprintf(FERROR, "receive_sums failed\n");
                        return;
                }
@@ -192,16 +198,22 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                if (!read_batch) {
                        fd = do_open(fname, O_RDONLY, 0);
                        if (fd == -1) {
-                               io_error = 1;
-                               rprintf(FERROR, "send_files failed to open %s: %s\n",
-                                       full_fname(fname), strerror(errno));
+                               if (errno == ENOENT) {
+                                       io_error |= IOERR_VANISHED;
+                                       rprintf(FINFO, "file has vanished: %s\n",
+                                               full_fname(fname));
+                               } else {
+                                       io_error |= IOERR_GENERAL;
+                                       rprintf(FERROR, "send_files failed to open %s: %s\n",
+                                               full_fname(fname), strerror(errno));
+                               }
                                free_sums(s);
                                continue;
                        }
 
                        /* map the local file */
                        if (do_fstat(fd, &st) != 0) {
-                               io_error = 1;
+                               io_error |= IOERR_GENERAL;
                                rprintf(FERROR, "fstat failed: %s\n", strerror(errno));
                                free_sums(s);
                                close(fd);
@@ -235,11 +247,11 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 
                set_compression(fname);
 
-               if (read_batch) { /* dw */
+               if (read_batch) {
                        /* read checksums originally computed on sender side */
                        read_batch_csum_info(i, s, &checksums_match);
                        if (checksums_match) {
-                               read_batch_delta_file( (char *) &j, sizeof(int) );
+                               read_batch_delta_file((char*)&j, sizeof (int));
                                if (j != i) {    /* if flist index entries don't match*/
                                        rprintf(FINFO, "index mismatch in send_files\n");
                                        rprintf(FINFO, "read index = %d flist ndx = %d\n", j, i);
@@ -251,7 +263,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                                        write_sum_head(f_out, s);
                                        done = 0;
                                        while (!done) {
-                                               read_batch_delta_file( (char *) &buff_len, sizeof(int) );
+                                               read_batch_delta_file((char*)&buff_len, sizeof (int));
                                                write_int(f_out, buff_len);
                                                if (buff_len == 0) {
                                                        done = 1;
@@ -276,8 +288,16 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                        log_send(file, &initial_stats);
                }
 
-               if (!read_batch) { /* dw */
-                       if (buf) unmap_file(buf);
+               if (!read_batch) {
+                       if (buf) {
+                               j = unmap_file(buf);
+                               if (j) {
+                                       io_error |= IOERR_GENERAL;
+                                       rprintf(FERROR,
+                                           "read errors mapping %s: (%d) %s\n",
+                                           full_fname(fname), j, strerror(j));
+                               }
+                       }
                        close(fd);
                }
 
@@ -293,7 +313,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
        match_report();
 
        write_int(f_out, -1);
-       if (write_batch || read_batch) { /* dw */
+       if (write_batch || read_batch) {
                close_batch_csums_file();
                close_batch_delta_file();
        }