X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/cbbe4892087b74fb8ed2aac6078ee933ac02e920..4b957c22381cf1848ff6a5e59249bb71ba79e9fa:/flist.c

diff --git a/flist.c b/flist.c
index 0cb82144..78b2c859 100644
--- a/flist.c
+++ b/flist.c
@@ -21,12 +21,13 @@
 
 #include "rsync.h"
 
+extern struct stats stats;
+
 extern int csum_length;
 
 extern int verbose;
 extern int am_server;
 extern int always_checksum;
-extern off_t total_size;
 
 extern int cvs_exclude;
 
@@ -42,21 +43,34 @@ extern int preserve_uid;
 extern int preserve_gid;
 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 = NULL;
-
-static void clean_fname(char *name);
+static struct exclude_struct **local_exclude_list;
 
+int link_stat(const char *Path, STRUCT_STAT *Buffer) 
+{
+#if SUPPORT_LINKS
+    if (copy_links) {
+	return do_stat(Path, Buffer);
+    } else {
+	return do_lstat(Path, Buffer);
+    }
+#else
+    return do_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
  */
-static int match_file_name(char *fname,struct stat *st)
+static int match_file_name(char *fname,STRUCT_STAT *st)
 {
-  if (check_exclude(fname,local_exclude_list)) {
+  if (check_exclude(fname,local_exclude_list,st)) {
     if (verbose > 2)
-      fprintf(FERROR,"excluding file %s\n",fname);
+      rprintf(FINFO,"excluding file %s\n",fname);
     return 0;
   }
   return 1;
@@ -67,30 +81,27 @@ static dev_t filesystem_dev;
 
 static void set_filesystem(char *fname)
 {
-  struct stat st;
-  if (lstat(fname,&st) != 0) return;
+  STRUCT_STAT st;
+  if (link_stat(fname,&st) != 0) return;
   filesystem_dev = st.st_dev;
 }
 
 
 static void send_directory(int f,struct file_list *flist,char *dir);
 
-static char *flist_dir = NULL;
+static char *flist_dir;
 
-extern void (*send_file_entry)(struct file_struct *file,int f);
-extern void (*receive_file_entry)(struct file_struct *file,
-				  unsigned char flags,int f);
 
-
-void send_file_entry_v11(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=0;
-  static mode_t last_mode=0;
-  static dev_t last_rdev=0;
-  static uid_t last_uid=0;
-  static gid_t last_gid=0;
-  static char lastname[MAXPATHLEN]="";
+  static time_t last_time;
+  static mode_t last_mode;
+  static dev_t last_rdev;
+  static uid_t last_uid;
+  static gid_t last_gid;
+  static char lastname[MAXPATHLEN];
+  char *fname;
   int l1,l2;
 
   if (f == -1) return;
@@ -100,7 +111,9 @@ void send_file_entry_v11(struct file_struct *file,int f)
     return;
   }
 
-  flags = FILE_VALID;
+  fname = f_name(file);
+
+  flags = base_flags;
 
   if (file->mode == last_mode) flags |= SAME_MODE;
   if (file->rdev == last_rdev) flags |= SAME_RDEV;
@@ -108,12 +121,17 @@ void send_file_entry_v11(struct file_struct *file,int f)
   if (file->gid == last_gid) flags |= SAME_GID;
   if (file->modtime == last_time) flags |= SAME_TIME;
 
-  for (l1=0;lastname[l1] && file->name[l1] == lastname[l1];l1++) ;
-  l2 = strlen(file->name) - l1;
+  for (l1=0;lastname[l1] && (fname[l1] == lastname[l1]) && (l1 < 255);l1++) ;  
+  l2 = strlen(fname) - l1;
 
   if (l1 > 0) flags |= SAME_NAME;
   if (l2 > 255) flags |= LONG_NAME;
 
+  /* we must make sure we don't send a zero flags byte or the other
+     end will terminate the flist transfer */
+  if (flags == 0 && !S_ISDIR(file->mode)) flags |= FLAG_DELETE;
+  if (flags == 0) flags |= LONG_NAME;
+
   write_byte(f,flags);  
   if (flags & SAME_NAME)
     write_byte(f,l1);
@@ -121,17 +139,21 @@ void send_file_entry_v11(struct file_struct *file,int f)
     write_int(f,l2);
   else
     write_byte(f,l2);
-  write_buf(f,file->name+l1,l2);
+  write_buf(f,fname+l1,l2);
 
-  write_int(f,(int)file->length);
+  write_longint(f,file->length);
   if (!(flags & SAME_TIME))
     write_int(f,(int)file->modtime);
   if (!(flags & SAME_MODE))
     write_int(f,(int)file->mode);
-  if (preserve_uid && !(flags & SAME_UID))
-    write_int(f,(int)file->uid);
-  if (preserve_gid && !(flags & SAME_GID))
-    write_int(f,(int)file->gid);
+  if (preserve_uid && !(flags & SAME_UID)) {
+	  add_uid(file->uid);
+	  write_int(f,(int)file->uid);
+  }
+  if (preserve_gid && !(flags & SAME_GID)) {
+	  add_gid(file->gid);
+	  write_int(f,(int)file->gid);
+  }
   if (preserve_devices && IS_DEVICE(file->mode) && !(flags & SAME_RDEV))
     write_int(f,(int)file->rdev);
 
@@ -144,13 +166,13 @@ void send_file_entry_v11(struct file_struct *file,int f)
 
 #if SUPPORT_HARD_LINKS
   if (preserve_hard_links && S_ISREG(file->mode)) {
-    write_int(f,file->dev);
-    write_int(f,file->inode);
+    write_int(f,(int)file->dev);
+    write_int(f,(int)file->inode);
   }
 #endif
 
   if (always_checksum) {
-    write_buf(f,file->sum,csum_length);
+	  write_buf(f,file->sum,csum_length);
   }       
 
   last_mode = file->mode;
@@ -159,22 +181,25 @@ void send_file_entry_v11(struct file_struct *file,int f)
   last_gid = file->gid;
   last_time = file->modtime;
 
-  strncpy(lastname,file->name,MAXPATHLEN-1);
+  strlcpy(lastname,fname,MAXPATHLEN-1);
   lastname[MAXPATHLEN-1] = 0;
 }
 
 
 
-void receive_file_entry_v11(struct file_struct *file,
-			    unsigned char flags,int f)
+static void receive_file_entry(struct file_struct **fptr,
+			       unsigned flags,int f)
 {
-  static time_t last_time=0;
-  static mode_t last_mode=0;
-  static dev_t last_rdev=0;
-  static uid_t last_uid=0;
-  static gid_t last_gid=0;
-  static char lastname[MAXPATHLEN]="";
+  static time_t last_time;
+  static mode_t last_mode;
+  static dev_t last_rdev;
+  static uid_t last_uid;
+  static gid_t last_gid;
+  static char lastname[MAXPATHLEN];
+  char thisname[MAXPATHLEN];
   int l1=0,l2=0;
+  char *p;
+  struct file_struct *file;
 
   if (flags & SAME_NAME)
     l1 = read_byte(f);
@@ -184,16 +209,48 @@ void receive_file_entry_v11(struct file_struct *file,
   else
     l2 = read_byte(f);
 
-  bzero((char *)file,sizeof(*file));
+  file = (struct file_struct *)malloc(sizeof(*file));
+  if (!file) out_of_memory("receive_file_entry");
+  memset((char *)file, 0, sizeof(*file));
+  (*fptr) = file;
 
-  file->name = (char *)malloc(l1+l2+1);
-  if (!file->name) out_of_memory("receive_file_entry 1");
+  if (l2 >= MAXPATHLEN-l1) overflow("receive_file_entry");
 
-  strncpy(file->name,lastname,l1);
-  read_buf(f,file->name+l1,l2);
-  file->name[l1+l2] = 0;
+  strlcpy(thisname,lastname,l1);
+  read_sbuf(f,&thisname[l1],l2);
+  thisname[l1+l2] = 0;
 
-  file->length = (off_t)read_int(f);
+  strlcpy(lastname,thisname,MAXPATHLEN-1);
+  lastname[MAXPATHLEN-1] = 0;
+
+  clean_fname(thisname);
+
+  if (relative_paths && thisname[0] == '/') {
+	  /* strip / off absolute paths in destination */
+	  memmove(thisname, thisname+1, strlen(thisname));
+	  if (!thisname[0]) strcpy(thisname,".");
+  }
+
+  if ((p = strrchr(thisname,'/'))) {
+	  static char *lastdir;
+	  *p = 0;
+	  if (lastdir && strcmp(thisname, lastdir)==0) {
+		  file->dirname = lastdir;
+	  } else {
+		  file->dirname = strdup(thisname);
+		  lastdir = file->dirname;
+	  }
+	  file->basename = strdup(p+1);
+  } else {
+	  file->dirname = NULL;
+	  file->basename = strdup(thisname);
+  }
+
+  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);
   if (preserve_uid)
@@ -207,8 +264,7 @@ void receive_file_entry_v11(struct file_struct *file,
     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
@@ -218,94 +274,163 @@ void receive_file_entry_v11(struct file_struct *file,
   }
 #endif
   
-  if (always_checksum)
-    read_buf(f,file->sum,csum_length);
+  if (always_checksum) {
+	  file->sum = (char *)malloc(MD4_SUM_LENGTH);
+	  if (!file->sum) out_of_memory("md4 sum");
+	  read_buf(f,file->sum,csum_length);
+  }
   
   last_mode = file->mode;
   last_rdev = file->rdev;
   last_uid = file->uid;
   last_gid = file->gid;
   last_time = file->modtime;
-
-  strncpy(lastname,file->name,MAXPATHLEN-1);
-  lastname[MAXPATHLEN-1] = 0;
 }
 
 
-
-static struct file_struct *make_file(char *fname)
+/* determine if a file in a different filesstem should be skipped
+   when one_file_system is set. We bascally only want to include
+   the mount points - but they can be hard to find! */
+static int skip_filesystem(char *fname, STRUCT_STAT *st)
 {
-  static struct file_struct file;
-  struct stat st;
-  char sum[SUM_LENGTH];
+	STRUCT_STAT st2;
+	char *p = strrchr(fname, '/');
 
-  bzero(sum,SUM_LENGTH);
+	/* skip all but directories */
+	if (!S_ISDIR(st->st_mode)) return 1;
 
-  if (lstat(fname,&st) != 0) {
-    fprintf(FERROR,"%s: %s\n",
-	    fname,strerror(errno));
-    return NULL;
-  }
+	/* if its not a subdirectory then allow */
+	if (!p) return 0;
 
-  if (S_ISDIR(st.st_mode) && !recurse) {
-    fprintf(FERROR,"skipping directory %s\n",fname);
-    return NULL;
-  }
+	*p = 0;
+	if (link_stat(fname, &st2)) {
+		*p = '/';
+		return 0;
+	}
+	*p = '/';
+	
+	return (st2.st_dev != filesystem_dev);
+}
 
-  if (one_file_system && st.st_dev != filesystem_dev)
-    return NULL;
+static struct file_struct *make_file(char *fname)
+{
+	struct file_struct *file;
+	STRUCT_STAT st;
+	char sum[SUM_LENGTH];
+	char *p;
+	char cleaned_name[MAXPATHLEN];
+
+	strlcpy(cleaned_name, fname, MAXPATHLEN-1);
+	cleaned_name[MAXPATHLEN-1] = 0;
+	clean_fname(cleaned_name);
+	fname = cleaned_name;
+
+	memset(sum,0,SUM_LENGTH);
+
+	if (link_stat(fname,&st) != 0) {
+		io_error = 1;
+		rprintf(FERROR,"%s: %s\n",
+			fname,strerror(errno));
+		return NULL;
+	}
 
-  if (!match_file_name(fname,&st))
-    return NULL;
+	if (S_ISDIR(st.st_mode) && !recurse) {
+		rprintf(FINFO,"skipping directory %s\n",fname);
+		return NULL;
+	}
+	
+	if (one_file_system && st.st_dev != filesystem_dev) {
+		if (skip_filesystem(fname, &st))
+			return NULL;
+	}
+	
+	if (!match_file_name(fname,&st))
+		return NULL;
+	
+	if (verbose > 2)
+		rprintf(FINFO,"make_file(%s)\n",fname);
+	
+	file = (struct file_struct *)malloc(sizeof(*file));
+	if (!file) out_of_memory("make_file");
+	memset((char *)file,0,sizeof(*file));
+
+	if ((p = strrchr(fname,'/'))) {
+		static char *lastdir;
+		*p = 0;
+		if (lastdir && strcmp(fname, lastdir)==0) {
+			file->dirname = lastdir;
+		} else {
+			file->dirname = strdup(fname);
+			lastdir = file->dirname;
+		}
+		file->basename = strdup(p+1);
+		*p = '/';
+	} else {
+		file->dirname = NULL;
+		file->basename = strdup(fname);
+	}
 
-  if (verbose > 2)
-    fprintf(FERROR,"make_file(%s)\n",fname);
-
-  bzero((char *)&file,sizeof(file));
-
-  file.name = strdup(fname);
-  file.modtime = st.st_mtime;
-  file.length = st.st_size;
-  file.mode = st.st_mode;
-  file.uid = st.st_uid;
-  file.gid = st.st_gid;
-  file.dev = st.st_dev;
-  file.inode = st.st_ino;
+	file->modtime = st.st_mtime;
+	file->length = st.st_size;
+	file->mode = st.st_mode;
+	file->uid = st.st_uid;
+	file->gid = st.st_gid;
+	file->dev = st.st_dev;
+	file->inode = st.st_ino;
 #ifdef HAVE_ST_RDEV
-  file.rdev = st.st_rdev;
+	file->rdev = st.st_rdev;
 #endif
 
 #if SUPPORT_LINKS
-  if (S_ISLNK(st.st_mode)) {
-    int l;
-    char lnk[MAXPATHLEN];
-    if ((l=readlink(fname,lnk,MAXPATHLEN-1)) == -1) {
-      fprintf(FERROR,"readlink %s : %s\n",fname,strerror(errno));
-      return NULL;
-    }
-    lnk[l] = 0;
-    file.link = strdup(lnk);
-  }
+	if (S_ISLNK(st.st_mode)) {
+		int l;
+		char lnk[MAXPATHLEN];
+		if ((l=readlink(fname,lnk,MAXPATHLEN-1)) == -1) {
+			io_error=1;
+			rprintf(FERROR,"readlink %s : %s\n",
+				fname,strerror(errno));
+			return NULL;
+		}
+		lnk[l] = 0;
+		file->link = strdup(lnk);
+	}
 #endif
 
-  if (always_checksum && S_ISREG(st.st_mode)) {
-    file_checksum(fname,file.sum,st.st_size);
-  }       
+	if (always_checksum) {
+		file->sum = (char *)malloc(MD4_SUM_LENGTH);
+		if (!file->sum) out_of_memory("md4 sum");
+		/* 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)
-    file.dir = strdup(flist_dir);
-  else
-    file.dir = NULL;
+	if (flist_dir) {
+		static char *lastdir;
+		if (lastdir && strcmp(lastdir, flist_dir)==0) {
+			file->basedir = lastdir;
+		} else {
+			file->basedir = strdup(flist_dir);
+			lastdir = file->basedir;
+		}
+	} else {
+		file->basedir = NULL;
+	}
 
-  if (!S_ISDIR(st.st_mode))
-    total_size += st.st_size;
+	if (!S_ISDIR(st.st_mode))
+		stats.total_size += st.st_size;
 
-  return &file;
+	return file;
 }
 
 
 
-static void send_file_name(int f,struct file_list *flist,char *fname)
+static void send_file_name(int f,struct file_list *flist,char *fname,
+			   int recursive, unsigned base_flags)
 {
   struct file_struct *file;
 
@@ -314,27 +439,27 @@ static void send_file_name(int f,struct file_list *flist,char *fname)
   if (!file) return;  
   
   if (flist->count >= flist->malloced) {
-	  if (flist->malloced < 100)
-		  flist->malloced += 100;
+	  if (flist->malloced < 1000)
+		  flist->malloced += 1000;
 	  else
-		  flist->malloced *= 1.8;
-	  flist->files = (struct file_struct *)realloc(flist->files,
-						       sizeof(flist->files[0])*
-						       flist->malloced);
+		  flist->malloced *= 2;
+	  flist->files = (struct file_struct **)realloc(flist->files,
+							sizeof(flist->files[0])*
+							flist->malloced);
 	  if (!flist->files)
 		  out_of_memory("send_file_name");
   }
 
-  if (strcmp(file->name,"/")) {
-    flist->files[flist->count++] = *file;    
-    send_file_entry(file,f);
+  if (strcmp(file->basename,"")) {
+    flist->files[flist->count++] = file;
+    send_file_entry(file,f,base_flags);
   }
 
-  if (S_ISDIR(file->mode) && recurse) {
-    char **last_exclude_list = local_exclude_list;
-    send_directory(f,flist,file->name);
-    local_exclude_list = last_exclude_list;
-    return;
+  if (S_ISDIR(file->mode) && recursive) {
+	  struct exclude_struct **last_exclude_list = local_exclude_list;
+	  send_directory(f,flist,f_name(file));
+	  local_exclude_list = last_exclude_list;
+	  return;
   }
 }
 
@@ -342,144 +467,202 @@ static void send_file_name(int f,struct file_list *flist,char *fname)
 
 static void send_directory(int f,struct file_list *flist,char *dir)
 {
-  DIR *d;
-  struct dirent *di;
-  char fname[MAXPATHLEN];
-  int l;
-  char *p;
+	DIR *d;
+	struct dirent *di;
+	char fname[MAXPATHLEN];
+	int l;
+	char *p;
+
+	d = opendir(dir);
+	if (!d) {
+		io_error = 1;
+		rprintf(FERROR,"opendir(%s): %s\n",
+			dir,strerror(errno));
+		return;
+	}
 
-  d = opendir(dir);
-  if (!d) {
-    fprintf(FERROR,"%s: %s\n",
-	    dir,strerror(errno));
-    return;
-  }
+	strlcpy(fname,dir,MAXPATHLEN-1);
+	l = strlen(fname);
+	if (fname[l-1] != '/') {
+		if (l == MAXPATHLEN-1) {
+			io_error = 1;
+			rprintf(FERROR,"skipping long-named directory %s\n",fname);
+			closedir(d);
+			return;
+		}
+		strlcat(fname,"/", MAXPATHLEN-1);
+		l++;
+	}
+	p = fname + strlen(fname);
 
-  strncpy(fname,dir,MAXPATHLEN-1);
-  fname[MAXPATHLEN-1]=0;
-  l = strlen(fname);
-  if (fname[l-1] != '/') {
-	  strcat(fname,"/");
-	  l++;
-  }
-  p = fname + strlen(fname);
-
-  if (cvs_exclude) {
-    strcpy(p,".cvsignore");
-    local_exclude_list = make_exclude_list(fname,NULL,0);
-  }  
-
-  for (di=readdir(d); di; di=readdir(d)) {
-    if (strcmp(di->d_name,".")==0 ||
-	strcmp(di->d_name,"..")==0)
-      continue;
-    strncpy(p,di->d_name,MAXPATHLEN-(l+1));
-    send_file_name(f,flist,fname);
-  }
+	if (cvs_exclude) {
+		if (strlen(fname) + strlen(".cvsignore") <= MAXPATHLEN-1) {
+			strcpy(p,".cvsignore");
+			local_exclude_list = make_exclude_list(fname,NULL,0,0);
+		} else {
+			io_error = 1;
+			rprintf(FINFO,"cannot cvs-exclude in long-named directory %s\n",fname);
+		}
+	}  
+	
+	for (di=readdir(d); di; di=readdir(d)) {
+		char *dname = d_name(di);
+		if (strcmp(dname,".")==0 ||
+		    strcmp(dname,"..")==0)
+			continue;
+		strlcpy(p,dname,MAXPATHLEN-(l+1));
+		send_file_name(f,flist,fname,recurse,0);
+	}
 
-  closedir(d);
+	closedir(d);
 }
 
 
 
 struct file_list *send_file_list(int f,int argc,char *argv[])
 {
-  int i,l;
-  struct stat st;
-  char *p,*dir;
-  char dbuf[MAXPATHLEN];
-  struct file_list *flist;
+	int i,l;
+	STRUCT_STAT st;
+	char *p,*dir;
+	char lastpath[MAXPATHLEN]="";
+	struct file_list *flist;
+	int64 start_write;
+
+	if (verbose && recurse && !am_server && f != -1) {
+		rprintf(FINFO,"building file list ... ");
+		rflush(FINFO);
+	}
 
-  if (verbose && recurse && !am_server) {
-    fprintf(FINFO,"building file list ... ");
-    fflush(FINFO);
-  }
+	start_write = stats.total_written;
 
-  flist = (struct file_list *)malloc(sizeof(flist[0]));
-  if (!flist) out_of_memory("send_file_list");
+	flist = (struct file_list *)malloc(sizeof(flist[0]));
+	if (!flist) out_of_memory("send_file_list");
 
-  flist->count=0;
-  flist->malloced = 100;
-  flist->files = (struct file_struct *)malloc(sizeof(flist->files[0])*
-					      flist->malloced);
-  if (!flist->files) out_of_memory("send_file_list");
+	flist->count=0;
+	flist->malloced = 1000;
+	flist->files = (struct file_struct **)malloc(sizeof(flist->files[0])*
+						     flist->malloced);
+	if (!flist->files) out_of_memory("send_file_list");
 
-  for (i=0;i<argc;i++) {
-    char fname2[MAXPATHLEN];
-    char *fname = fname2;
+	if (f != -1) {
+		io_start_buffering(f);
+	}
 
-    strncpy(fname,argv[i],MAXPATHLEN-1);
-    fname[MAXPATHLEN-1] = 0;
+	for (i=0;i<argc;i++) {
+		char fname2[MAXPATHLEN];
+		char *fname = fname2;
 
-    l = strlen(fname);
-    if (l != 1 && fname[l-1] == '/') {
-      strcat(fname,".");
-    }
+		strlcpy(fname,argv[i],MAXPATHLEN-1);
 
-    if (lstat(fname,&st) != 0) {
-      fprintf(FERROR,"%s : %s\n",fname,strerror(errno));
-      continue;
-    }
+		l = strlen(fname);
+		if (l != 1 && fname[l-1] == '/') {
+			strlcat(fname,".",MAXPATHLEN-1);
+		}
 
-    if (S_ISDIR(st.st_mode) && !recurse) {
-      fprintf(FERROR,"skipping directory %s\n",fname);
-      continue;
-    }
+		if (link_stat(fname,&st) != 0) {
+			io_error=1;
+			rprintf(FERROR,"%s : %s\n",fname,strerror(errno));
+			continue;
+		}
 
-    dir = NULL;
-
-    if (!relative_paths) {
-	    p = strrchr(fname,'/');
-	    if (p) {
-		    *p = 0;
-		    if (p == fname) 
-			    dir = "/";
-		    else
-			    dir = fname;      
-		    fname = p+1;      
-	    }
-    }
+		if (S_ISDIR(st.st_mode) && !recurse) {
+			rprintf(FINFO,"skipping directory %s\n",fname);
+			continue;
+		}
 
-    if (!*fname)
-      fname = ".";
-
-    if (dir && *dir) {
-      if (getcwd(dbuf,MAXPATHLEN-1) == NULL) {
-	fprintf(FERROR,"getwd : %s\n",strerror(errno));
-	exit_cleanup(1);
-      }
-      if (chdir(dir) != 0) {
-	fprintf(FERROR,"chdir %s : %s\n",dir,strerror(errno));
-	continue;
-      }
-      flist_dir = dir;
-      if (one_file_system)
-	set_filesystem(fname);
-      send_file_name(f,flist,fname);
-      flist_dir = NULL;
-      if (chdir(dbuf) != 0) {
-	fprintf(FERROR,"chdir %s : %s\n",dbuf,strerror(errno));
-	exit_cleanup(1);
-      }
-      continue;
-    }
+		dir = NULL;
+
+		if (!relative_paths) {
+			p = strrchr(fname,'/');
+			if (p) {
+				*p = 0;
+				if (p == fname) 
+					dir = "/";
+				else
+					dir = fname;      
+				fname = p+1;      
+			}
+		} else if (f != -1 && (p=strrchr(fname,'/'))) {
+			/* this ensures we send the intermediate directories,
+			   thus getting their permissions right */
+			*p = 0;
+			if (strcmp(lastpath,fname)) {
+				strlcpy(lastpath, fname, sizeof(lastpath)-1);
+				*p = '/';
+				for (p=fname+1; (p=strchr(p,'/')); p++) {
+					int copy_links_saved = copy_links;
+					*p = 0;
+					copy_links = 0;
+					send_file_name(f, flist, fname, 0, 0);
+					copy_links = copy_links_saved;
+					*p = '/';
+				}
+			} else {
+				*p = '/';
+			}
+		}
+		
+		if (!*fname)
+			fname = ".";
+		
+		if (dir && *dir) {
+			char *olddir = push_dir(dir, 1);
+
+			if (!olddir) {
+				io_error=1;
+				rprintf(FERROR,"push_dir %s : %s\n",
+					dir,strerror(errno));
+				continue;
+			}
+
+			flist_dir = dir;
+			if (one_file_system)
+				set_filesystem(fname);
+			send_file_name(f,flist,fname,recurse,FLAG_DELETE);
+			flist_dir = NULL;
+			if (pop_dir(olddir) != 0) {
+				rprintf(FERROR,"pop_dir %s : %s\n",
+					dir,strerror(errno));
+				exit_cleanup(1);
+			}
+			continue;
+		}
+		
+		if (one_file_system)
+			set_filesystem(fname);
+		send_file_name(f,flist,fname,recurse,FLAG_DELETE);
+	}
 
-    if (one_file_system)
-      set_filesystem(fname);
-    send_file_name(f,flist,fname);
-  }
+	if (f != -1) {
+		send_file_entry(NULL,f,0);
+	}
 
-  if (f != -1) {
-    send_file_entry(NULL,f);
-    write_flush(f);
-  }
+	if (verbose && recurse && !am_server && f != -1)
+		rprintf(FINFO,"done\n");
+	
+	clean_flist(flist);
+	
+	/* now send the uid/gid list. This was introduced in protocol
+           version 15 */
+	if (f != -1 && remote_version >= 15) {
+		send_uid_list(f);
+	}
 
-  if (verbose && recurse && !am_server)
-    fprintf(FINFO,"done\n");
+	/* if protocol version is >= 17 then send the io_error flag */
+	if (f != -1 && remote_version >= 17) {
+		write_int(f, io_error);
+	}
 
-  clean_flist(flist);
+	if (f != -1) {
+		io_end_buffering(f);
+		stats.flist_size = stats.total_written - start_write;
+		stats.num_files = flist->count;
+	}
 
-  return flist;
+	if (verbose > 2)
+		rprintf(FINFO,"send_file_list done\n");
+
+	return flist;
 }
 
 
@@ -487,20 +670,23 @@ struct file_list *recv_file_list(int f)
 {
   struct file_list *flist;
   unsigned char flags;
+  int64 start_read;
 
   if (verbose && recurse && !am_server) {
-    fprintf(FINFO,"receiving file list ... ");
-    fflush(FINFO);
+    rprintf(FINFO,"receiving file list ... ");
+    rflush(FINFO);
   }
 
+  start_read = stats.total_read;
+
   flist = (struct file_list *)malloc(sizeof(flist[0]));
   if (!flist)
     goto oom;
 
   flist->count=0;
-  flist->malloced=100;
-  flist->files = (struct file_struct *)malloc(sizeof(flist->files[0])*
-					      flist->malloced);
+  flist->malloced=1000;
+  flist->files = (struct file_struct **)malloc(sizeof(flist->files[0])*
+					       flist->malloced);
   if (!flist->files)
     goto oom;
 
@@ -509,38 +695,54 @@ struct file_list *recv_file_list(int f)
     int i = flist->count;
 
     if (i >= flist->malloced) {
-	  if (flist->malloced < 100)
-		  flist->malloced += 100;
+	  if (flist->malloced < 1000)
+		  flist->malloced += 1000;
 	  else
-		  flist->malloced *= 1.8;
-	  flist->files =(struct file_struct *)realloc(flist->files,
-						      sizeof(flist->files[0])*
-						      flist->malloced);
+		  flist->malloced *= 2;
+	  flist->files =(struct file_struct **)realloc(flist->files,
+						       sizeof(flist->files[0])*
+						       flist->malloced);
 	  if (!flist->files)
 		  goto oom;
     }
 
     receive_file_entry(&flist->files[i],flags,f);
 
-    if (S_ISREG(flist->files[i].mode))
-      total_size += flist->files[i].length;
+    if (S_ISREG(flist->files[i]->mode))
+	    stats.total_size += flist->files[i]->length;
 
     flist->count++;
 
     if (verbose > 2)
-      fprintf(FERROR,"recv_file_name(%s)\n",flist->files[i].name);
+      rprintf(FINFO,"recv_file_name(%s)\n",f_name(flist->files[i]));
   }
 
 
   if (verbose > 2)
-    fprintf(FERROR,"received %d names\n",flist->count);
+    rprintf(FINFO,"received %d names\n",flist->count);
 
   clean_flist(flist);
 
   if (verbose && recurse && !am_server) {
-    fprintf(FINFO,"done\n");
+    rprintf(FINFO,"done\n");
   }
 
+  /* now recv the uid/gid list. This was introduced in protocol version 15 */
+  if (f != -1 && remote_version >= 15) {
+	  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)
+    rprintf(FINFO,"recv_file_list done\n");
+
+  stats.flist_size = stats.total_read - start_read;
+  stats.num_files = flist->count;
+
   return flist;
 
 oom:
@@ -549,22 +751,14 @@ oom:
 }
 
 
-int file_compare(struct file_struct *f1,struct file_struct *f2)
+int file_compare(struct file_struct **f1,struct file_struct **f2)
 {
-  if (!f1->name && !f2->name) return 0;
-  if (!f1->name) return -1;
-  if (!f2->name) return 1;
-  return strcmp(f1->name,f2->name);
-}
-
-
-/* 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;
+	if (!(*f1)->basename && !(*f2)->basename) return 0;
+	if (!(*f1)->basename) return -1;
+	if (!(*f2)->basename) return 1;
+	if ((*f1)->dirname == (*f2)->dirname)
+		return u_strcmp((*f1)->basename, (*f2)->basename);
+	return u_strcmp(f_name(*f1),f_name(*f2));
 }
 
 
@@ -576,7 +770,7 @@ int flist_find(struct file_list *flist,struct file_struct *f)
 
 	while (low != high) {
 		int mid = (low+high)/2;
-		int ret = file_compare(&flist->files[flist_up(flist, mid)],f);
+		int ret = file_compare(&flist->files[flist_up(flist, mid)],&f);
 		if (ret == 0) return flist_up(flist, mid);
 		if (ret > 0) {
 			high=mid;
@@ -585,53 +779,39 @@ int flist_find(struct file_list *flist,struct file_struct *f)
 		}
 	}
 
-	if (file_compare(&flist->files[flist_up(flist,low)],f) == 0)
+	if (file_compare(&flist->files[flist_up(flist,low)],&f) == 0)
 		return flist_up(flist,low);
 	return -1;
 }
 
 
-static void clean_fname(char *name)
+/*
+ * free up one file
+ */
+static void free_file(struct file_struct *file)
 {
-  char *p;
-  int l;
-  int modified = 1;
-
-  if (!name) return;
-
-  while (modified) {
-    modified = 0;
-
-    if ((p=strstr(name,"/./"))) {
-      modified = 1;
-      while (*p) {
-	p[0] = p[2];
-	p++;
-      }
-    }
-
-    if ((p=strstr(name,"//"))) {
-      modified = 1;
-      while (*p) {
-	p[0] = p[1];
-	p++;
-      }
-    }
+	if (!file) return;
+	if (file->basename) free(file->basename);
+	if (file->link) free(file->link);
+	if (file->sum) free(file->sum);
+	memset((char *)file, 0, sizeof(*file));
+}
 
-    if (strncmp(p=name,"./",2) == 0) {      
-      modified = 1;
-      while (*p) {
-	p[0] = p[2];
-	p++;
-      }
-    }
 
-    l = strlen(p=name);
-    if (l > 1 && p[l-1] == '/') {
-      modified = 1;
-      p[l-1] = 0;
-    }
-  }
+/*
+ * free up all elements in a flist
+ */
+void flist_free(struct file_list *flist)
+{
+	int i;
+	for (i=1;i<flist->count;i++) {
+		free_file(flist->files[i]);
+		free(flist->files[i]);
+	}	
+	memset((char *)flist->files, 0, sizeof(flist->files[0])*flist->count);
+	free(flist->files);
+	memset((char *)flist, 0, sizeof(*flist));
+	free(flist);
 }
 
 
@@ -641,28 +821,48 @@ static void clean_fname(char *name)
  */
 void clean_flist(struct file_list *flist)
 {
-  int i;
+	int i;
 
-  if (!flist || flist->count == 0) 
-    return;
+	if (!flist || flist->count == 0) 
+		return;
   
-  for (i=0;i<flist->count;i++) {
-    clean_fname(flist->files[i].name);
-  }
-      
-  qsort(flist->files,flist->count,
-	sizeof(flist->files[0]),
-	(int (*)())file_compare);
-
-  for (i=1;i<flist->count;i++) {
-    if (flist->files[i].name &&
-	strcmp(flist->files[i].name,flist->files[i-1].name) == 0) {
-      if (verbose > 1 && !am_server)
-	fprintf(FERROR,"removing duplicate name %s from file list %d\n",
-		flist->files[i-1].name,i-1);
-      free(flist->files[i-1].name);
-      bzero((char *)&flist->files[i-1],sizeof(flist->files[i-1]));
-    } 
-  }
+	qsort(flist->files,flist->count,
+	      sizeof(flist->files[0]),
+	      (int (*)())file_compare);
+
+	for (i=1;i<flist->count;i++) {
+		if (flist->files[i]->basename &&
+		    flist->files[i-1]->basename &&
+		    strcmp(f_name(flist->files[i]),
+			   f_name(flist->files[i-1])) == 0) {
+			if (verbose > 1 && !am_server)
+				rprintf(FINFO,"removing duplicate name %s from file list %d\n",
+					f_name(flist->files[i-1]),i-1);
+			free_file(flist->files[i]);
+		} 
+	}
+}
+
+
+/*
+ * return the full filename of a flist entry
+ */
+char *f_name(struct file_struct *f)
+{
+	static char names[10][MAXPATHLEN];
+	static int n;
+	char *p = names[n];
+
+	if (!f || !f->basename) return NULL;
+
+	n = (n+1)%10;
+
+	if (f->dirname) {
+		slprintf(p, MAXPATHLEN-1, "%s/%s", f->dirname, f->basename);
+	} else {
+		strlcpy(p, f->basename, MAXPATHLEN-1);
+	}
+
+	return p;
 }