handle things more grecefully when one machine supports hard links and

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index d298db1..0cb8214 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -187,7 +187,7 @@ void receive_file_entry_v11(struct file_struct *file,
   bzero((char *)file,sizeof(*file));
 
   file->name = (char *)malloc(l1+l2+1);
-  if (!file->name) out_of_memory("receive_file_entry");
+  if (!file->name) out_of_memory("receive_file_entry 1");
 
   strncpy(file->name,lastname,l1);
   read_buf(f,file->name+l1,l2);
@@ -203,15 +203,13 @@ void receive_file_entry_v11(struct file_struct *file,
   if (preserve_devices && IS_DEVICE(file->mode))
     file->rdev = (flags & SAME_RDEV) ? last_rdev : (dev_t)read_int(f);
 
-#if SUPPORT_LINKS
   if (preserve_links && S_ISLNK(file->mode)) {
     int l = read_int(f);
     file->link = (char *)malloc(l+1);
-    if (!file->link) out_of_memory("receive_file_entry");
+    if (!file->link) out_of_memory("receive_file_entry 2");
     read_buf(f,file->link,l);
     file->link[l] = 0;
   }
-#endif
 
 #if SUPPORT_HARD_LINKS
   if (preserve_hard_links && S_ISREG(file->mode)) {
@@ -360,8 +358,10 @@ static void send_directory(int f,struct file_list *flist,char *dir)
   strncpy(fname,dir,MAXPATHLEN-1);
   fname[MAXPATHLEN-1]=0;
   l = strlen(fname);
-  if (fname[l-1] != '/')
-    strcat(fname,"/");
+  if (fname[l-1] != '/') {
+         strcat(fname,"/");
+         l++;
+  }
   p = fname + strlen(fname);
 
   if (cvs_exclude) {
@@ -373,7 +373,7 @@ static void send_directory(int f,struct file_list *flist,char *dir)
     if (strcmp(di->d_name,".")==0 ||
        strcmp(di->d_name,"..")==0)
       continue;
-    strncpy(p,di->d_name,MAXPATHLEN-l);
+    strncpy(p,di->d_name,MAXPATHLEN-(l+1));
     send_file_name(f,flist,fname);
   }
 
@@ -558,22 +558,36 @@ int file_compare(struct file_struct *f1,struct file_struct *f2)
 }
 
 
+/* we need this function because of the silly way in which duplicate
+   entries are handled in the file lists - we can't change this
+   without breaking existing versions */
+static int flist_up(struct file_list *flist, int i)
+{
+       while (!flist->files[i].name) i++;
+       return i;
+}
+
+
 int flist_find(struct file_list *flist,struct file_struct *f)
 {
-  int low=0,high=flist->count-1;
-
-  while (low != high) {
-    int mid = (low+high)/2;
-    int ret = file_compare(&flist->files[mid],f);
-    if (ret == 0) return mid;
-    if (ret > 0) 
-      high=mid;
-    else
-      low=mid+1;
-  }
-  if (file_compare(&flist->files[low],f) == 0)
-    return low;
-  return -1;
+       int low=0,high=flist->count-1;
+
+       if (flist->count <= 0) return -1;
+
+       while (low != high) {
+               int mid = (low+high)/2;
+               int ret = file_compare(&flist->files[flist_up(flist, mid)],f);
+               if (ret == 0) return flist_up(flist, mid);
+               if (ret > 0) {
+                       high=mid;
+               } else {
+                       low=mid+1;
+               }
+       }
+
+       if (file_compare(&flist->files[flist_up(flist,low)],f) == 0)
+               return flist_up(flist,low);
+       return -1;
 }