Another try at socklen_t: just check for it, and otherwise use int.

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index 45c0920..d2ab1b3 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -70,8 +70,8 @@ static struct sum_struct *receive_sums(int f)
                offset += s->sums[i].len;
 
                if (verbose > 3)
-                       rprintf(FINFO,"chunk[%d] len=%d offset=%d sum1=%08x\n",
-                               i,s->sums[i].len,(int)s->sums[i].offset,s->sums[i].sum1);
+                       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;
@@ -97,8 +97,6 @@ void send_files(struct file_list *flist,int f_out,int f_in)
        if (verbose > 2)
                rprintf(FINFO,"send_files starting\n");
 
-       setup_readbuffer(f_in);
-
        while (1) {
                int offset=0;
 
@@ -128,17 +126,17 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 
                fname[0] = 0;
                if (file->basedir) {
-                       strlcpy(fname,file->basedir,MAXPATHLEN-1);
+                       strlcpy(fname,file->basedir,MAXPATHLEN);
                        if (strlen(fname) == MAXPATHLEN-1) {
                                io_error = 1;
                                rprintf(FERROR, "send_files failed on long-named directory %s\n",
                                        fname);
                                return;
                        }
-                       strlcat(fname,"/",MAXPATHLEN-1);
+                       strlcat(fname,"/",MAXPATHLEN);
                        offset = strlen(file->basedir)+1;
                }
-               strlcat(fname,f_name(file),MAXPATHLEN-strlen(fname));
+               strlcat(fname,f_name(file),MAXPATHLEN);
          
                if (verbose > 2) 
                        rprintf(FINFO,"send_files(%d,%s)\n",i,fname);
@@ -160,7 +158,7 @@ void send_files(struct file_list *flist,int f_out,int f_in)
                        return;
                }
          
-               fd = open(fname,O_RDONLY);
+               fd = do_open(fname, O_RDONLY, 0);
                if (fd == -1) {
                        io_error = 1;
                        rprintf(FERROR,"send_files failed to open %s: %s\n",
@@ -185,8 +183,8 @@ void send_files(struct file_list *flist,int f_out,int f_in)
                }
          
                if (verbose > 2)
-                       rprintf(FINFO,"send_files mapped %s of size %d\n",
-                               fname,(int)st.st_size);
+                       rprintf(FINFO,"send_files mapped %s of size %.0f\n",
+                               fname,(double)st.st_size);
 
                write_int(f_out,i);
          
@@ -200,6 +198,8 @@ void send_files(struct file_list *flist,int f_out,int f_in)
                if (!am_server) {
                        log_transfer(file, fname+offset);
                }
+
+               set_compression(fname);
          
                match_sums(f_out,s,buf,st.st_size);