a few code cleanups

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index f6f2c99..63b8663 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -209,7 +209,7 @@ void send_file_entry(struct file_struct *file,int f)
 #endif
 
   if (always_checksum) {
-    write_buf(f,file->sum,csum_length);
+         write_buf(f,file->sum,csum_length);
   }       
 
   last_mode = file->mode;
@@ -251,8 +251,10 @@ void receive_file_entry(struct file_struct **fptr,
   bzero((char *)file,sizeof(*file));
   (*fptr) = file;
 
+  if (l2 >= MAXPATHLEN-l1) overflow("receive_file_entry");
+
   strncpy(thisname,lastname,l1);
-  read_buf(f,&thisname[l1],l2);
+  read_sbuf(f,&thisname[l1],l2);
   thisname[l1+l2] = 0;
 
   strncpy(lastname,thisname,MAXPATHLEN-1);
@@ -292,8 +294,7 @@ void receive_file_entry(struct file_struct **fptr,
     int l = read_int(f);
     file->link = (char *)malloc(l+1);
     if (!file->link) out_of_memory("receive_file_entry 2");
-    read_buf(f,file->link,l);
-    file->link[l] = 0;
+    read_sbuf(f,file->link,l);
   }
 
 #if SUPPORT_HARD_LINKS
@@ -425,10 +426,17 @@ static struct file_struct *make_file(char *fname)
        }
 #endif
 
-       if (always_checksum && S_ISREG(st.st_mode)) {
+       if (always_checksum) {
                file->sum = (char *)malloc(MD4_SUM_LENGTH);
                if (!file->sum) out_of_memory("md4 sum");
-               file_checksum(fname,file->sum,st.st_size);
+               /* drat. we have to provide a null checksum for non-regular
+                  files in order to be compatible with earlier versions
+                  of rsync */
+               if (S_ISREG(st.st_mode)) {
+                       file_checksum(fname,file->sum,st.st_size);
+               } else {
+                       memset(file->sum, 0, MD4_SUM_LENGTH);
+               }
        }       
 
        if (flist_dir) {