fixed a bug in the handling of the new --relative option. The file was

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 1ae8c34..b333b5b 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -159,8 +159,8 @@ void send_file_entry_v11(struct file_struct *file,int f)
   last_gid = file->gid;
   last_time = file->modtime;
 
-  strcpy(lastname,file->name);
-  lastname[255] = 0;
+  strncpy(lastname,file->name,MAXPATHLEN-1);
+  lastname[MAXPATHLEN-1] = 0;
 }
 
 
@@ -229,8 +229,8 @@ void receive_file_entry_v11(struct file_struct *file,
   last_gid = file->gid;
   last_time = file->modtime;
 
-  strcpy(lastname,file->name);
-  lastname[255] = 0;
+  strncpy(lastname,file->name,MAXPATHLEN-1);
+  lastname[MAXPATHLEN-1] = 0;
 }
 
 
@@ -357,10 +357,13 @@ static void send_directory(int f,struct file_list *flist,char *dir)
     return;
   }
 
-  strcpy(fname,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) {
@@ -372,7 +375,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;
-    strcpy(p,di->d_name);
+    strncpy(p,di->d_name,MAXPATHLEN-(l+1));
     send_file_name(f,flist,fname);
   }
 
@@ -407,7 +410,8 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
     char fname2[MAXPATHLEN];
     char *fname = fname2;
 
-    strcpy(fname,argv[i]);
+    strncpy(fname,argv[i],MAXPATHLEN-1);
+    fname[MAXPATHLEN-1] = 0;
 
     l = strlen(fname);
     if (l != 1 && fname[l-1] == '/') {
@@ -556,22 +560,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;
-
-  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;
 }