standard input on server may be nonblocking

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 874d8aa..c9ffa78 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -19,6 +19,8 @@
 
 #include "rsync.h"
 
+extern int csum_length;
+
 extern int verbose;
 extern int am_server;
 extern int always_checksum;
@@ -67,7 +69,7 @@ static void send_sums(struct sum_struct *s,int f_out)
   if (s)
     for (i=0;i<s->count;i++) {
       write_int(f_out,s->sums[i].sum1);
-      write_buf(f_out,s->sums[i].sum2,SUM_LENGTH);
+      write_buf(f_out,s->sums[i].sum2,csum_length);
     }
   write_flush(f_out);
 }
@@ -111,9 +113,10 @@ static struct sum_struct *generate_sums(char *buf,off_t len,int n)
   
   for (i=0;i<count;i++) {
     int n1 = MIN(len,n);
+    char *map = map_ptr(buf,offset,n1);
 
-    s->sums[i].sum1 = get_checksum1(buf,n1);
-    get_checksum2(buf,n1,s->sums[i].sum2);
+    s->sums[i].sum1 = get_checksum1(map,n1);
+    get_checksum2(map,n1,s->sums[i].sum2);
 
     s->sums[i].offset = offset;
     s->sums[i].len = n1;
@@ -124,7 +127,6 @@ static struct sum_struct *generate_sums(char *buf,off_t len,int n)
              i,(int)s->sums[i].offset,s->sums[i].len,s->sums[i].sum1);
 
     len -= n1;
-    buf += n1;
     offset += n1;
   }
 
@@ -164,7 +166,7 @@ static struct sum_struct *receive_sums(int f)
 
   for (i=0;i<s->count;i++) {
     s->sums[i].sum1 = read_int(f);
-    read_buf(f,s->sums[i].sum2,SUM_LENGTH);
+    read_buf(f,s->sums[i].sum2,csum_length);
 
     s->sums[i].offset = offset;
     s->sums[i].i = i;
@@ -286,8 +288,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
 #endif
 
 #ifdef HAVE_MKNOD
-  if (preserve_devices && 
-      (S_ISCHR(flist->files[i].mode) || S_ISBLK(flist->files[i].mode))) {
+  if (preserve_devices && IS_DEVICE(flist->files[i].mode)) {
     if (statret != 0 || 
        st.st_mode != flist->files[i].mode ||
        st.st_rdev != flist->files[i].dev) {    
@@ -344,7 +345,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
   if (st.st_size == flist->files[i].length &&
       ((!ignore_times && st.st_mtime == flist->files[i].modtime) ||
        (always_checksum && S_ISREG(st.st_mode) &&        
-       memcmp(sum,flist->files[i].sum,SUM_LENGTH) == 0))) {
+       memcmp(sum,flist->files[i].sum,csum_length) == 0))) {
     set_perms(fname,&flist->files[i],&st,1);
     return;
   }
@@ -364,11 +365,6 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
 
   if (st.st_size > 0) {
     buf = map_file(fd,st.st_size);
-    if (!buf) {
-      fprintf(stderr,"mmap : %s\n",strerror(errno));
-      close(fd);
-      return;
-    }
   } else {
     buf = NULL;
   }
@@ -421,7 +417,7 @@ static void receive_data(int f_in,char *buf,int fd,char *fname)
        fprintf(stderr,"chunk[%d] of size %d at %d offset=%d\n",
                i,len,(int)offset2,(int)offset);
 
-      if (write(fd,buf+offset2,len) != len) {
+      if (write(fd,map_ptr(buf,offset2,len),len) != len) {
        fprintf(stderr,"write failed on %s : %s\n",fname,strerror(errno));
        exit(1);
       }
@@ -456,6 +452,9 @@ static void delete_files(struct file_list *flist)
   char *dot=".";
   int i;
 
+  if (cvs_exclude)
+    add_cvs_excludes();
+
   if (!(local_file_list = send_file_list(-1,recurse,1,&dot)))
     return;
 
@@ -469,7 +468,7 @@ static void delete_files(struct file_list *flist)
 
 static char *cleanup_fname = NULL;
 
-int sig_int(void)
+void sig_int(void)
 {
   if (cleanup_fname)
     unlink(cleanup_fname);
@@ -486,8 +485,9 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
   char *buf;
   int i;
 
-  if (verbose > 2)
+  if (verbose > 2) {
     fprintf(stderr,"recv_files(%d) starting\n",flist->count);
+  }
 
   if (recurse && delete_mode && !local_name && flist->count>0) {
     delete_files(flist);
@@ -513,30 +513,22 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
        fprintf(stderr,"recv_files(%s)\n",fname);
 
       /* open the file */  
-      if ((fd1 = open(fname,O_RDONLY)) == -1 &&
-         (fd1 = open(fname,O_RDONLY|O_CREAT,flist->files[i].mode)) == -1) {
-       fprintf(stderr,"recv_files failed to open %s\n",fname);
-       return -1;
-      }
+      fd1 = open(fname,O_RDONLY);
 
-      if (fstat(fd1,&st) != 0) {
+      if (fd1 != -1 && fstat(fd1,&st) != 0) {
        fprintf(stderr,"fstat %s : %s\n",fname,strerror(errno));
        close(fd1);
        return -1;
       }
 
-      if (!S_ISREG(st.st_mode)) {
+      if (fd1 != -1 && !S_ISREG(st.st_mode)) {
        fprintf(stderr,"%s : not a regular file\n",fname);
        close(fd1);
        return -1;
       }
 
-      if (st.st_size > 0) {
+      if (fd1 != -1 && st.st_size > 0) {
        buf = map_file(fd1,st.st_size);
-       if (!buf) {
-         fprintf(stderr,"map_file failed\n");
-         return -1;
-       }
       } else {
        buf = NULL;
       }
@@ -550,7 +542,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
        fprintf(stderr,"mktemp %s failed\n",fnametmp);
        return -1;
       }
-      fd2 = open(fnametmp,O_WRONLY|O_CREAT,st.st_mode);
+      fd2 = open(fnametmp,O_WRONLY|O_CREAT,flist->files[i].mode);
       if (fd2 == -1) {
        fprintf(stderr,"open %s : %s\n",fnametmp,strerror(errno));
        return -1;
@@ -564,7 +556,10 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
       /* recv file data */
       receive_data(f_in,buf,fd2,fname);
 
-      close(fd1);
+      if (fd1 != -1) {
+       unmap_file(buf,st.st_size);
+       close(fd1);
+      }
       close(fd2);
 
       if (verbose > 2)
@@ -573,7 +568,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
       if (make_backups) {
        char fnamebak[MAXPATHLEN];
        sprintf(fnamebak,"%s%s",fname,backup_suffix);
-       if (rename(fname,fnamebak) != 0) {
+       if (rename(fname,fnamebak) != 0 && errno != ENOENT) {
          fprintf(stderr,"rename %s %s : %s\n",fname,fnamebak,strerror(errno));
          exit(1);
        }
@@ -587,8 +582,6 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 
       cleanup_fname = NULL;
 
-      unmap_file(buf,st.st_size);
-
       set_perms(fname,&flist->files[i],NULL,0);
     }
 
@@ -613,6 +606,8 @@ off_t send_files(struct file_list *flist,int f_out,int f_in)
   if (verbose > 2)
     fprintf(stderr,"send_files starting\n");
 
+  setup_nonblocking(f_in,f_out);
+
   while (1) 
     {
       i = read_int(f_in);
@@ -656,10 +651,6 @@ off_t send_files(struct file_list *flist,int f_out,int f_in)
       
       if (st.st_size > 0) {
        buf = map_file(fd,st.st_size);
-       if (!buf) {
-         fprintf(stderr,"map_file failed : %s\n",strerror(errno));       
-         return -1;
-       }
       } else {
        buf = NULL;
       }