When not using -p and file being copied to already existed, was mistakenly

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index d77e7b5..9bf0e95 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -50,7 +50,11 @@ static int skip_file(char *fname,
        if (always_checksum && S_ISREG(st->st_mode)) {
                char sum[MD4_SUM_LENGTH];
                file_checksum(fname,sum,st->st_size);
-               return (memcmp(sum,file->sum,csum_length) == 0);
+               if (remote_version < 21) {
+                       return (memcmp(sum,file->sum,2) == 0);
+               } else {
+                       return (memcmp(sum,file->sum,MD4_SUM_LENGTH) == 0);
+               }
        }
 
        if (size_only) {
@@ -86,17 +90,19 @@ static int adapt_block_size(struct file_struct *file, int bsize)
 static void send_sums(struct sum_struct *s,int f_out)
 {
        int i;
-
-  /* tell the other guy how many we are going to be doing and how many
-     bytes there are in the last chunk */
+       
+       /* tell the other guy how many we are going to be doing and how many
+          bytes there are in the last chunk */
        write_int(f_out,s?s->count:0);
        write_int(f_out,s?s->n:block_size);
        write_int(f_out,s?s->remainder:0);
-       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,csum_length);
-               }
+
+       if (!s) return;
+
+       for (i=0;i<s->count;i++) {
+               write_int(f_out,s->sums[i].sum1);
+               write_buf(f_out,s->sums[i].sum2,csum_length);
+       }
 }
 
 
@@ -171,6 +177,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
        char fnamecmpbuf[MAXPATHLEN];
        extern char *compare_dest;
        extern int list_only;
+       extern int preserve_perms;
 
        if (list_only) return;
 
@@ -179,6 +186,15 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
 
        statret = link_stat(fname,&st);
 
+       if (statret == 0 && 
+           !preserve_perms && 
+           (S_ISDIR(st.st_mode) == S_ISDIR(file->mode))) {
+               /* if the file exists already and we aren't perserving
+                   presmissions then act as though the remote end sent
+                   us the file permissions we already have */
+               file->mode = (file->mode & _S_IFMT) | (st.st_mode & ~_S_IFMT);
+       }
+
        if (S_ISDIR(file->mode)) {
                if (dry_run) return;
                if (statret == 0 && !S_ISDIR(st.st_mode)) {
@@ -334,7 +350,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
        }
 
        /* open the file */  
-       fd = open(fnamecmp,O_RDONLY);
+       fd = do_open(fnamecmp, O_RDONLY, 0);
 
        if (fd == -1) {
                rprintf(FERROR,"failed to open %s : %s\n",fnamecmp,strerror(errno));