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 e67d4b2..86646bb 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -44,6 +44,7 @@ extern int preserve_times;
 extern int relative_paths;
 extern int copy_links;
 extern int remote_version;
+extern int io_error;
 
 static char **local_exclude_list;
 
@@ -68,7 +69,7 @@ static int match_file_name(char *fname,struct stat *st)
 {
   if (check_exclude(fname,local_exclude_list)) {
     if (verbose > 2)
-      fprintf(FERROR,"excluding file %s\n",fname);
+      fprintf(FINFO,"excluding file %s\n",fname);
     return 0;
   }
   return 1;
@@ -133,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;
@@ -154,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;
@@ -208,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;
@@ -223,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;
@@ -250,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);
@@ -277,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);
@@ -291,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
@@ -356,13 +359,14 @@ static struct file_struct *make_file(char *fname)
        bzero(sum,SUM_LENGTH);
 
        if (link_stat(fname,&st) != 0) {
+               io_error = 1;
                fprintf(FERROR,"%s: %s\n",
                        fname,strerror(errno));
                return NULL;
        }
 
        if (S_ISDIR(st.st_mode) && !recurse) {
-               fprintf(FERROR,"skipping directory %s\n",fname);
+               fprintf(FINFO,"skipping directory %s\n",fname);
                return NULL;
        }
        
@@ -375,7 +379,7 @@ static struct file_struct *make_file(char *fname)
                return NULL;
        
        if (verbose > 2)
-               fprintf(FERROR,"make_file(%s)\n",fname);
+               fprintf(FINFO,"make_file(%s)\n",fname);
        
        file = (struct file_struct *)malloc(sizeof(*file));
        if (!file) out_of_memory("make_file");
@@ -413,6 +417,7 @@ static struct file_struct *make_file(char *fname)
                int l;
                char lnk[MAXPATHLEN];
                if ((l=readlink(fname,lnk,MAXPATHLEN-1)) == -1) {
+                       io_error=1;
                        fprintf(FERROR,"readlink %s : %s\n",
                                fname,strerror(errno));
                        return NULL;
@@ -422,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) {
@@ -449,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;
 
@@ -471,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) {
@@ -494,6 +506,7 @@ static void send_directory(int f,struct file_list *flist,char *dir)
 
        d = opendir(dir);
        if (!d) {
+               io_error = 1;
                fprintf(FERROR,"%s: %s\n",
                        dir,strerror(errno));
                return;
@@ -504,6 +517,7 @@ static void send_directory(int f,struct file_list *flist,char *dir)
        l = strlen(fname);
        if (fname[l-1] != '/') {
                if (l == MAXPATHLEN-1) {
+                       io_error = 1;
                        fprintf(FERROR,"skipping long-named directory %s\n",fname);
                        closedir(d);
                        return;
@@ -518,7 +532,8 @@ static void send_directory(int f,struct file_list *flist,char *dir)
                        strcpy(p,".cvsignore");
                        local_exclude_list = make_exclude_list(fname,NULL,0);
                } else {
-                       fprintf(FERROR,"cannot cvs-exclude in long-named directory %s\n",fname);
+                       io_error = 1;
+                       fprintf(FINFO,"cannot cvs-exclude in long-named directory %s\n",fname);
                }
        }  
        
@@ -527,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);
@@ -571,12 +586,13 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
                }
 
                if (link_stat(fname,&st) != 0) {
+                       io_error=1;
                        fprintf(FERROR,"%s : %s\n",fname,strerror(errno));
                        continue;
                }
 
                if (S_ISDIR(st.st_mode) && !recurse) {
-                       fprintf(FERROR,"skipping directory %s\n",fname);
+                       fprintf(FINFO,"skipping directory %s\n",fname);
                        continue;
                }
 
@@ -601,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 {
@@ -618,6 +634,7 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
                                exit_cleanup(1);
                        }
                        if (chdir(dir) != 0) {
+                               io_error=1;
                                fprintf(FERROR,"chdir %s : %s\n",
                                        dir,strerror(errno));
                                continue;
@@ -625,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",
@@ -637,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);
        }
 
@@ -656,6 +673,14 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
                send_uid_list(f);
        }
 
+       /* if protocol version is >= 17 then send the io_error flag */
+       if (f != -1 && remote_version >= 17) {
+               write_int(f, io_error);
+       }
+
+       if (verbose > 2)
+               fprintf(FINFO,"send_file_list done\n");
+
        return flist;
 }
 
@@ -705,12 +730,12 @@ struct file_list *recv_file_list(int f)
     flist->count++;
 
     if (verbose > 2)
-      fprintf(FERROR,"recv_file_name(%s)\n",f_name(flist->files[i]));
+      fprintf(FINFO,"recv_file_name(%s)\n",f_name(flist->files[i]));
   }
 
 
   if (verbose > 2)
-    fprintf(FERROR,"received %d names\n",flist->count);
+    fprintf(FINFO,"received %d names\n",flist->count);
 
   clean_flist(flist);
 
@@ -723,6 +748,14 @@ struct file_list *recv_file_list(int f)
          recv_uid_list(f, flist);
   }
 
+  /* if protocol version is >= 17 then recv the io_error flag */
+  if (f != -1 && remote_version >= 17) {
+         io_error |= read_int(f);
+  }
+
+  if (verbose > 2)
+    fprintf(FINFO,"recv_file_list done\n");
+
   return flist;
 
 oom:
@@ -816,7 +849,7 @@ void clean_flist(struct file_list *flist)
                    strcmp(f_name(flist->files[i]),
                           f_name(flist->files[i-1])) == 0) {
                        if (verbose > 1 && !am_server)
-                               fprintf(FERROR,"removing duplicate name %s from file list %d\n",
+                               fprintf(FINFO,"removing duplicate name %s from file list %d\n",
                                        f_name(flist->files[i-1]),i-1);
                        free_file(flist->files[i]);
                }