X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9a52223bce23c54dabff27c8e02d4814c7a498dd..95a38e8684439082bd86a988e593939e10172881:/flist.c

diff --git a/flist.c b/flist.c
index b21618df..894cf16c 100644
--- a/flist.c
+++ b/flist.c
@@ -42,12 +42,26 @@ extern int preserve_uid;
 extern int preserve_gid;
 extern int preserve_times;
 extern int relative_paths;
+extern int copy_links;
 
 static char **local_exclude_list = NULL;
 
 static void clean_fname(char *name);
 
 
+int link_stat(const char *Path, struct stat *Buffer) 
+{
+#if SUPPORT_LINKS
+    if (copy_links) {
+	return stat(Path, Buffer);
+    } else {
+	return lstat(Path, Buffer);
+    }
+#else
+    return stat(Path, Buffer);
+#endif
+}
+
 /*
   This function is used to check if a file should be included/excluded
   from the list of files based on its name and type etc
@@ -68,7 +82,7 @@ static dev_t filesystem_dev;
 static void set_filesystem(char *fname)
 {
   struct stat st;
-  if (lstat(fname,&st) != 0) return;
+  if (link_stat(fname,&st) != 0) return;
   filesystem_dev = st.st_dev;
 }
 
@@ -187,7 +201,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 +217,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)) {
@@ -243,7 +255,7 @@ static struct file_struct *make_file(char *fname)
 
   bzero(sum,SUM_LENGTH);
 
-  if (lstat(fname,&st) != 0) {
+  if (link_stat(fname,&st) != 0) {
     fprintf(FERROR,"%s: %s\n",
 	    fname,strerror(errno));
     return NULL;
@@ -361,14 +373,23 @@ static void send_directory(int f,struct file_list *flist,char *dir)
   fname[MAXPATHLEN-1]=0;
   l = strlen(fname);
   if (fname[l-1] != '/') {
+        if (l == MAXPATHLEN-1) {
+              fprintf(FERROR,"skipping long-named directory %s\n",fname);
+              closedir(d);
+              return;
+        }
 	  strcat(fname,"/");
 	  l++;
   }
   p = fname + strlen(fname);
 
   if (cvs_exclude) {
-    strcpy(p,".cvsignore");
-    local_exclude_list = make_exclude_list(fname,NULL,0);
+    if (strlen(fname) + strlen(".cvsignore") <= MAXPATHLEN-1) {
+      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);
+    }
   }  
 
   for (di=readdir(d); di; di=readdir(d)) {
@@ -392,7 +413,7 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
   char dbuf[MAXPATHLEN];
   struct file_list *flist;
 
-  if (verbose && recurse && !am_server) {
+  if (verbose && recurse && !am_server && f != -1) {
     fprintf(FINFO,"building file list ... ");
     fflush(FINFO);
   }
@@ -418,7 +439,7 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
       strcat(fname,".");
     }
 
-    if (lstat(fname,&st) != 0) {
+    if (link_stat(fname,&st) != 0) {
       fprintf(FERROR,"%s : %s\n",fname,strerror(errno));
       continue;
     }
@@ -476,7 +497,7 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
     write_flush(f);
   }
 
-  if (verbose && recurse && !am_server)
+  if (verbose && recurse && !am_server && f != -1)
     fprintf(FINFO,"done\n");
 
   clean_flist(flist);
@@ -560,22 +581,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;
 }
 
 
@@ -608,10 +643,9 @@ static void clean_fname(char *name)
 
     if (strncmp(p=name,"./",2) == 0) {      
       modified = 1;
-      while (*p) {
+      do {
 	p[0] = p[2];
-	p++;
-      }
+      } while (*p++);
     }
 
     l = strlen(p=name);