fix up the int64 handling a little. It should work on a few more

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index f6f2c99..86646bb 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -134,7 +134,7 @@ static void clean_fname(char *name)
 
 
 
-void send_file_entry(struct file_struct *file,int f)
+void send_file_entry(struct file_struct *file,int f,unsigned base_flags)
 {
   unsigned char flags;
   static time_t last_time;
@@ -155,7 +155,7 @@ void send_file_entry(struct file_struct *file,int f)
 
   fname = f_name(file);
 
-  flags = FILE_VALID;
+  flags = base_flags;
 
   if (file->mode == last_mode) flags |= SAME_MODE;
   if (file->rdev == last_rdev) flags |= SAME_RDEV;
@@ -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;
@@ -224,8 +224,8 @@ void send_file_entry(struct file_struct *file,int f)
 
 
 
-void receive_file_entry(struct file_struct **fptr,
-                       unsigned char flags,int f)
+static void receive_file_entry(struct file_struct **fptr,
+                              unsigned flags,int f)
 {
   static time_t last_time;
   static mode_t last_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);
@@ -278,6 +280,7 @@ void receive_file_entry(struct file_struct **fptr,
   if (!file->basename) out_of_memory("receive_file_entry 1");
 
 
+  file->flags = flags;
   file->length = read_longint(f);
   file->modtime = (flags & SAME_TIME) ? last_time : (time_t)read_int(f);
   file->mode = (flags & SAME_MODE) ? last_mode : (mode_t)read_int(f);
@@ -292,8 +295,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 +427,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) {
@@ -452,7 +461,7 @@ static struct file_struct *make_file(char *fname)
 
 
 static void send_file_name(int f,struct file_list *flist,char *fname,
-                          int recursive)
+                          int recursive, unsigned base_flags)
 {
   struct file_struct *file;
 
@@ -474,7 +483,7 @@ static void send_file_name(int f,struct file_list *flist,char *fname,
 
   if (strcmp(file->basename,"")) {
     flist->files[flist->count++] = file;
-    send_file_entry(file,f);
+    send_file_entry(file,f,base_flags);
   }
 
   if (S_ISDIR(file->mode) && recursive) {
@@ -533,7 +542,7 @@ static void send_directory(int f,struct file_list *flist,char *dir)
                    strcmp(di->d_name,"..")==0)
                        continue;
                strncpy(p,di->d_name,MAXPATHLEN-(l+1));
-               send_file_name(f,flist,fname,recurse);
+               send_file_name(f,flist,fname,recurse,FLAG_DELETE);
        }
 
        closedir(d);
@@ -608,7 +617,7 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
                                *p = '/';
                                for (p=fname+1; (p=strchr(p,'/')); p++) {
                                        *p = 0;
-                                       send_file_name(f, flist, fname, 0);
+                                       send_file_name(f, flist, fname, 0, 0);
                                        *p = '/';
                                }
                        } else {
@@ -633,7 +642,7 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
                        flist_dir = dir;
                        if (one_file_system)
                                set_filesystem(fname);
-                       send_file_name(f,flist,fname,recurse);
+                       send_file_name(f,flist,fname,recurse,FLAG_DELETE);
                        flist_dir = NULL;
                        if (chdir(dbuf) != 0) {
                                fprintf(FERROR,"chdir %s : %s\n",
@@ -645,11 +654,11 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
                
                if (one_file_system)
                        set_filesystem(fname);
-               send_file_name(f,flist,fname,recurse);
+               send_file_name(f,flist,fname,recurse,FLAG_DELETE);
        }
 
        if (f != -1) {
-               send_file_entry(NULL,f);
+               send_file_entry(NULL,f,0);
                write_flush(f);
        }