a large change to make rsync much more memory efficient. This is done

in 3 ways:

1) the realloc is done on a list of pointers, not a list of structures
2) only the basename of the file is now kept in the file struct an a
   util function f_name() is now used to access the full name when
   required.
3) pointers to directory names are re-used

hopefully I haven't broken anything. This will need lots of testing.

diff --git a/compat.c b/compat.c
index 1c28c25..237e40c 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -37,152 +37,6 @@ extern int checksum_seed;
 
 extern int remote_version;
 
- void (*send_file_entry)(struct file_struct *file,int f) = NULL;
- void (*receive_file_entry)(struct file_struct *file,
-                           unsigned char flags,int f) = NULL;
-
-
-void send_file_entry_v10(struct file_struct *file,int f)
-{
-  unsigned char flags;
-  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 lastdir[MAXPATHLEN]="";
-  char *p=NULL;
-
-  if (f == -1) return;
-
-  if (!file) {
-    write_byte(f,0);
-    return;
-  }
-
-  flags = FILE_VALID;
-
-  if (file->mode == last_mode) flags |= SAME_MODE;
-  if (file->rdev == last_rdev) flags |= SAME_RDEV;
-  if (file->uid == last_uid) flags |= SAME_UID;
-  if (file->gid == last_gid) flags |= SAME_GID;
-    
-  if (strncmp(file->name,lastdir,strlen(lastdir)) == 0) {
-    flags |= SAME_DIR;
-    p = file->name + strlen(lastdir);
-  } else {
-    p = file->name;
-  }
-
-  write_byte(f,flags);
-  if (flags & SAME_DIR)
-    write_byte(f,strlen(p));
-  else
-    write_int(f,strlen(p));
-  write_buf(f,p,strlen(p));
-  write_int(f,(int)file->modtime);
-  write_int(f,(int)file->length);
-  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_devices && IS_DEVICE(file->mode) && !(flags & SAME_RDEV))
-    write_int(f,(int)file->rdev);
-
-#if SUPPORT_LINKS
-  if (preserve_links && S_ISLNK(file->mode)) {
-    write_int(f,strlen(file->link));
-    write_buf(f,file->link,strlen(file->link));
-  }
-#endif
-
-  if (always_checksum) {
-    write_buf(f,file->sum,csum_length);
-  }       
-
-  last_mode = file->mode;
-  last_rdev = file->rdev;
-  last_uid = file->uid;
-  last_gid = file->gid;
-  p = strrchr(file->name,'/');
-  if (p) {
-    int l = (int)(p - file->name) + 1;
-    strncpy(lastdir,file->name,l);
-    lastdir[l] = 0;
-  } else {
-    strcpy(lastdir,"");
-  }
-}
-
-
-
-void receive_file_entry_v10(struct file_struct *file,
-                           unsigned char flags,int f)
-{
-  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 lastdir[MAXPATHLEN]="";
-  char *p=NULL;
-  int l1,l2;
-
-  if (flags & SAME_DIR) {
-    l1 = read_byte(f);
-    l2 = strlen(lastdir);
-  } else {
-    l1 = read_int(f);
-    l2 = 0;
-  }
-
-  file->name = (char *)malloc(l1+l2+1);
-  if (!file->name) out_of_memory("receive_file_entry");
-
-  strncpy(file->name,lastdir,l2);
-  read_buf(f,file->name+l2,l1);
-  file->name[l1+l2] = 0;
-
-  file->modtime = (time_t)read_int(f);
-  file->length = (off_t)read_int(f);
-  file->mode = (flags & SAME_MODE) ? last_mode : (mode_t)read_int(f);
-  if (preserve_uid)
-    file->uid = (flags & SAME_UID) ? last_uid : (uid_t)read_int(f);
-  if (preserve_gid)
-    file->gid = (flags & SAME_GID) ? last_gid : (gid_t)read_int(f);
-  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");
-    read_buf(f,file->link,l);
-    file->link[l] = 0;
-  }
-#endif
-  
-  if (always_checksum)
-    read_buf(f,file->sum,csum_length);
-  
-  last_mode = file->mode;
-  last_rdev = file->rdev;
-  last_uid = file->uid;
-  last_gid = file->gid;
-  p = strrchr(file->name,'/');
-  if (p) {
-    int l = (int)(p - file->name) + 1;
-    strncpy(lastdir,file->name,l);
-    lastdir[l] = 0;
-  } else {
-    strcpy(lastdir,"");
-  }
-}
-
-
-
-
 void setup_protocol(int f_out,int f_in)
 {
   if (am_server) {
@@ -201,14 +55,6 @@ void setup_protocol(int f_out,int f_in)
     exit_cleanup(1);
   }    
 
-  if (remote_version == 10) {
-    send_file_entry = send_file_entry_v10;
-    receive_file_entry = receive_file_entry_v10;
-  } else {
-    send_file_entry = send_file_entry_v11;
-    receive_file_entry = receive_file_entry_v11;
-  }
-
   if (remote_version >= 12) {
     if (am_server) {
       checksum_seed = time(NULL);

diff --git a/flist.c b/flist.c
index d438400..d9f8e44 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -47,9 +47,6 @@ extern int remote_version;
 
 static char **local_exclude_list = NULL;
 
-static void clean_fname(char *name);
-
-
 int link_stat(const char *Path, struct stat *Buffer) 
 {
 #if SUPPORT_LINKS
@@ -92,12 +89,51 @@ static void send_directory(int f,struct file_list *flist,char *dir);
 
 static char *flist_dir = NULL;
 
-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);
+static void clean_fname(char *name)
+{
+  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 (strncmp(p=name,"./",2) == 0) {      
+      modified = 1;
+      do {
+       p[0] = p[2];
+      } while (*p++);
+    }
 
-void send_file_entry_v11(struct file_struct *file,int f)
+    l = strlen(p=name);
+    if (l > 1 && p[l-1] == '/') {
+      modified = 1;
+      p[l-1] = 0;
+    }
+  }
+}
+
+
+
+void send_file_entry(struct file_struct *file,int f)
 {
   unsigned char flags;
   static time_t last_time=0;
@@ -106,6 +142,7 @@ void send_file_entry_v11(struct file_struct *file,int f)
   static uid_t last_uid=0;
   static gid_t last_gid=0;
   static char lastname[MAXPATHLEN]="";
+  char *fname;
   int l1,l2;
 
   if (f == -1) return;
@@ -115,6 +152,8 @@ void send_file_entry_v11(struct file_struct *file,int f)
     return;
   }
 
+  fname = f_name(file);
+
   flags = FILE_VALID;
 
   if (file->mode == last_mode) flags |= SAME_MODE;
@@ -123,8 +162,8 @@ 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++) ;
+  l2 = strlen(fname) - l1;
 
   if (l1 > 0) flags |= SAME_NAME;
   if (l2 > 255) flags |= LONG_NAME;
@@ -136,7 +175,7 @@ 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);
   if (!(flags & SAME_TIME))
@@ -178,22 +217,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);
+  strncpy(lastname,fname,MAXPATHLEN-1);
   lastname[MAXPATHLEN-1] = 0;
 }
 
 
 
-void receive_file_entry_v11(struct file_struct *file,
-                           unsigned char flags,int f)
+void receive_file_entry(struct file_struct **fptr,
+                       unsigned char 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 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);
@@ -203,14 +245,37 @@ void receive_file_entry_v11(struct file_struct *file,
   else
     l2 = read_byte(f);
 
+  file = (struct file_struct *)malloc(sizeof(*file));
+  if (!file) out_of_memory("receive_file_entry");
   bzero((char *)file,sizeof(*file));
+  (*fptr) = file;
+
+  strncpy(thisname,lastname,l1);
+  read_buf(f,&thisname[l1],l2);
+  thisname[l1+l2] = 0;
+
+  strncpy(lastname,thisname,MAXPATHLEN-1);
+  lastname[MAXPATHLEN-1] = 0;
+
+  clean_fname(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);
+  }
 
-  file->name = (char *)malloc(l1+l2+1);
-  if (!file->name) out_of_memory("receive_file_entry 1");
+  if (!file->basename) out_of_memory("receive_file_entry 1");
 
-  strncpy(file->name,lastname,l1);
-  read_buf(f,file->name+l1,l2);
-  file->name[l1+l2] = 0;
 
   file->length = (off_t)read_int(f);
   file->modtime = (flags & SAME_TIME) ? last_time : (time_t)read_int(f);
@@ -245,81 +310,110 @@ void receive_file_entry_v11(struct file_struct *file,
   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)
 {
-  static struct file_struct file;
-  struct stat st;
-  char sum[SUM_LENGTH];
-
-  bzero(sum,SUM_LENGTH);
-
-  if (link_stat(fname,&st) != 0) {
-    fprintf(FERROR,"%s: %s\n",
-           fname,strerror(errno));
-    return NULL;
-  }
-
-  if (S_ISDIR(st.st_mode) && !recurse) {
-    fprintf(FERROR,"skipping directory %s\n",fname);
-    return NULL;
-  }
-
-  if (one_file_system && st.st_dev != filesystem_dev)
-    return NULL;
+       struct file_struct *file;
+       struct stat st;
+       char sum[SUM_LENGTH];
+       char *p;
+       char cleaned_name[MAXPATHLEN];
+
+       strncpy(cleaned_name, fname, MAXPATHLEN-1);
+       cleaned_name[MAXPATHLEN-1] = 0;
+       clean_fname(cleaned_name);
+       fname = cleaned_name;
+
+       bzero(sum,SUM_LENGTH);
+
+       if (link_stat(fname,&st) != 0) {
+               fprintf(FERROR,"%s: %s\n",
+                       fname,strerror(errno));
+               return NULL;
+       }
 
-  if (!match_file_name(fname,&st))
-    return NULL;
+       if (S_ISDIR(st.st_mode) && !recurse) {
+               fprintf(FERROR,"skipping directory %s\n",fname);
+               return NULL;
+       }
+       
+       if (one_file_system && st.st_dev != filesystem_dev)
+               return NULL;
+       
+       if (!match_file_name(fname,&st))
+               return NULL;
+       
+       if (verbose > 2)
+               fprintf(FERROR,"make_file(%s)\n",fname);
+       
+       file = (struct file_struct *)malloc(sizeof(*file));
+       if (!file) out_of_memory("make_file");
+       bzero((char *)file,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) {
+                       fprintf(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 && S_ISREG(st.st_mode)) {
+               file_checksum(fname,file->sum,st.st_size);
+       }       
 
-  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))
+               total_size += st.st_size;
 
-  return &file;
+       return file;
 }
 
 
@@ -333,25 +427,25 @@ 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;    
+  if (strcmp(file->basename,"")) {
+    flist->files[flist->count++] = file;
     send_file_entry(file,f);
   }
 
   if (S_ISDIR(file->mode) && recurse) {
     char **last_exclude_list = local_exclude_list;
-    send_directory(f,flist,file->name);
+    send_directory(f,flist,f_name(file));
     local_exclude_list = last_exclude_list;
     return;
   }
@@ -361,51 +455,51 @@ 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;
-
-  d = opendir(dir);
-  if (!d) {
-    fprintf(FERROR,"%s: %s\n",
-           dir,strerror(errno));
-    return;
-  }
-
-  strncpy(fname,dir,MAXPATHLEN-1);
-  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);
+       DIR *d;
+       struct dirent *di;
+       char fname[MAXPATHLEN];
+       int l;
+       char *p;
+
+       d = opendir(dir);
+       if (!d) {
+               fprintf(FERROR,"%s: %s\n",
+                       dir,strerror(errno));
+               return;
+       }
 
-  if (cvs_exclude) {
-    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);
-    }
-  }  
+       strncpy(fname,dir,MAXPATHLEN-1);
+       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);
 
-  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);
+               } else {
+                       fprintf(FERROR,"cannot cvs-exclude in long-named directory %s\n",fname);
+               }
+       }  
+       
+       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);
+       }
 
-  closedir(d);
+       closedir(d);
 }
 
 
@@ -427,9 +521,9 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
   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);
+  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++) {
@@ -531,9 +625,9 @@ struct file_list *recv_file_list(int f)
     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;
 
@@ -542,26 +636,26 @@ 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))
+      total_size += flist->files[i]->length;
 
     flist->count++;
 
     if (verbose > 2)
-      fprintf(FERROR,"recv_file_name(%s)\n",flist->files[i].name);
+      fprintf(FERROR,"recv_file_name(%s)\n",f_name(flist->files[i]));
   }
 
 
@@ -587,12 +681,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);
+       if (!(*f1)->basename && !(*f2)->basename) return 0;
+       if (!(*f1)->basename) return -1;
+       if (!(*f2)->basename) return 1;
+       if ((*f1)->dirname == (*f2)->dirname)
+               return strcmp((*f1)->basename, (*f2)->basename);
+       return strcmp(f_name(*f1),f_name(*f2));
 }
 
 
@@ -604,7 +700,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;
@@ -613,52 +709,38 @@ 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);
+       bzero((char *)file, sizeof(*file));
+       free(file);
+}
 
-    if (strncmp(p=name,"./",2) == 0) {      
-      modified = 1;
-      do {
-       p[0] = p[2];
-      } while (*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]);
+       }       
+       bzero((char *)flist->files, sizeof(flist->files[0])*flist->count);
+       free(flist->files);
+       bzero((char *)flist, sizeof(*flist));
+       free(flist);
 }
 
 
@@ -668,28 +750,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 &&
+                   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",
+                                       f_name(flist->files[i-1]),i-1);
+                       free_file(flist->files[i]);
+                       flist->files[i] = NULL;
+               } 
+       }
+}
+
+
+/*
+ * 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) return NULL;
+
+       n = (n+1)%10;
+
+       if (f->dirname) {
+               sprintf(p, "%s/%s", f->dirname, f->basename);
+       } else {
+               strcpy(p, f->basename);
+       }
+
+       return p;
 }
 

diff --git a/hlink.c b/hlink.c
index 43f14ea..7360a02 100644 (file)
--- a/hlink.c
+++ b/hlink.c
@@ -36,7 +36,7 @@ static int hlink_compare(struct file_struct *f1,struct file_struct *f2)
   if (f1->inode != f2->inode) 
     return (f1->inode - f2->inode);
 
-  return file_compare(f1,f2);
+  return file_compare(&f1,&f2);
 }
 
 
@@ -114,35 +114,35 @@ void do_hard_links(struct file_list *flist)
   for (i=1;i<hlink_count;i++) {
     if (S_ISREG(hlink_list[i].mode) &&
        S_ISREG(hlink_list[i-1].mode) &&
-       hlink_list[i].name && hlink_list[i-1].name &&
+       hlink_list[i].basename && hlink_list[i-1].basename &&
        hlink_list[i].dev == hlink_list[i-1].dev &&
        hlink_list[i].inode == hlink_list[i-1].inode) {
       struct stat st1,st2;
 
-      if (link_stat(hlink_list[i-1].name,&st1) != 0) continue;
-      if (link_stat(hlink_list[i].name,&st2) != 0) {
-       if (!dry_run && link(hlink_list[i-1].name,hlink_list[i].name) != 0) {
+      if (link_stat(f_name(&hlink_list[i-1]),&st1) != 0) continue;
+      if (link_stat(f_name(&hlink_list[i]),&st2) != 0) {
+       if (!dry_run && link(f_name(&hlink_list[i-1]),f_name(&hlink_list[i])) != 0) {
                if (verbose > 0)
                        fprintf(FINFO,"link %s => %s : %s\n",
-                               hlink_list[i].name,
-                               hlink_list[i-1].name,strerror(errno));
+                               f_name(&hlink_list[i]),
+                               f_name(&hlink_list[i-1]),strerror(errno));
          continue;
        }
       } else {
        if (st2.st_dev == st1.st_dev && st2.st_ino == st1.st_ino) continue;
        
-       if (!dry_run && (unlink(hlink_list[i].name) != 0 ||
-                        link(hlink_list[i-1].name,hlink_list[i].name) != 0)) {
+       if (!dry_run && (unlink(f_name(&hlink_list[i])) != 0 ||
+                        link(f_name(&hlink_list[i-1]),f_name(&hlink_list[i])) != 0)) {
                if (verbose > 0)
                        fprintf(FINFO,"link %s => %s : %s\n",
-                               hlink_list[i].name,
-                               hlink_list[i-1].name,strerror(errno));
+                               f_name(&hlink_list[i]),
+                               f_name(&hlink_list[i-1]),strerror(errno));
          continue;
        }
       }
       if (verbose > 0)
              fprintf(FINFO,"%s => %s\n",
-                     hlink_list[i].name,hlink_list[i-1].name);
+                     f_name(&hlink_list[i]),f_name(&hlink_list[i-1]));
     }  
   }
 #endif

diff --git a/rsync.c b/rsync.c
index 682b2c4..059b384 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -284,7 +284,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
   struct map_struct *buf;
   struct sum_struct *s;
   int statret;
-  struct file_struct *file = &flist->files[i];
+  struct file_struct *file = flist->files[i];
 
   if (verbose > 2)
     fprintf(FERROR,"recv_generator(%s,%d)\n",fname,i);
@@ -367,7 +367,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
 
   if (preserve_hard_links && check_hard_link(file)) {
     if (verbose > 1)
-      fprintf(FINFO,"%s is a hard link\n",file->name);
+      fprintf(FINFO,"%s is a hard link\n",f_name(file));
     return;
   }
 
@@ -536,17 +536,17 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname)
 static void delete_one(struct file_struct *f)
 {
   if (!S_ISDIR(f->mode)) {
-    if (!dry_run && unlink(f->name) != 0) {
-      fprintf(FERROR,"unlink %s : %s\n",f->name,strerror(errno));
+    if (!dry_run && unlink(f_name(f)) != 0) {
+      fprintf(FERROR,"unlink %s : %s\n",f_name(f),strerror(errno));
     } else if (verbose) {
-      fprintf(FERROR,"deleting %s\n",f->name);
+      fprintf(FERROR,"deleting %s\n",f_name(f));
     }
   } else {    
-    if (!dry_run && rmdir(f->name) != 0) {
+    if (!dry_run && rmdir(f_name(f)) != 0) {
       if (errno != ENOTEMPTY)
-       fprintf(FERROR,"rmdir %s : %s\n",f->name,strerror(errno));
+       fprintf(FERROR,"rmdir %s : %s\n",f_name(f),strerror(errno));
     } else if (verbose) {
-      fprintf(FERROR,"deleting directory %s\n",f->name);      
+      fprintf(FERROR,"deleting directory %s\n",f_name(f));      
     }
   }
 }
@@ -567,7 +567,7 @@ static int delete_already_done(struct file_list *flist,int j)
 
        if (j == 0) return 0;
 
-       name = strdup(flist->files[j].name);
+       name = strdup(f_name(flist->files[j]));
 
        if (!name) {
                fprintf(FERROR,"out of memory in delete_already_done");
@@ -583,7 +583,7 @@ static int delete_already_done(struct file_list *flist,int j)
 
        while (low != high) {
                int mid = (low+high)/2;
-               int ret = strcmp(flist->files[flist_up(flist, mid)].name,name);
+               int ret = strcmp(f_name(flist->files[flist_up(flist, mid)]),name);
                if (ret == 0) {
                        free(name);
                        return 1;
@@ -597,7 +597,7 @@ static int delete_already_done(struct file_list *flist,int j)
 
        low = flist_up(flist, low);
 
-       if (strcmp(flist->files[low].name,name) == 0) {
+       if (strcmp(f_name(flist->files[low]),name) == 0) {
                free(name);
                return 1;
        }
@@ -619,9 +619,9 @@ static void delete_files(struct file_list *flist)
     add_cvs_excludes();
 
   for (j=0;j<flist->count;j++) {
-         char *name = flist->files[j].name;
+         char *name = f_name(flist->files[j]);
 
-         if (!S_ISDIR(flist->files[j].mode)) continue;
+         if (!S_ISDIR(flist->files[j]->mode)) continue;
 
          if (delete_already_done(flist, j)) continue;
 
@@ -632,11 +632,12 @@ static void delete_files(struct file_list *flist)
                  fprintf(FINFO,"deleting in %s\n", name);
 
          for (i=local_file_list->count-1;i>=0;i--) {
-                 if (!local_file_list->files[i].name) continue;
-                 if (-1 == flist_find(flist,&local_file_list->files[i])) {
-                         delete_one(&local_file_list->files[i]);
+                 if (!local_file_list->files[i]->basename) continue;
+                 if (-1 == flist_find(flist,local_file_list->files[i])) {
+                         delete_one(local_file_list->files[i]);
                  }    
          }
+         flist_free(local_file_list);
   }
 }
 
@@ -699,8 +700,8 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
        break;
       }
 
-      file = &flist->files[i];
-      fname = file->name;
+      file = flist->files[i];
+      fname = f_name(file);
 
       if (local_name)
        fname = local_name;
@@ -742,6 +743,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
       /* open tmp file */
       if (strlen(fname) > (MAXPATHLEN-8)) {
        fprintf(FERROR,"filename too long\n");
+       if (buf) unmap_file(buf);
        close(fd1);
        continue;
       }
@@ -784,8 +786,8 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
       /* recv file data */
       recv_ok = receive_data(f_in,buf,fd2,fname);
 
+      if (buf) unmap_file(buf);
       if (fd1 != -1) {
-       if (buf) unmap_file(buf);
        close(fd1);
       }
       close(fd2);
@@ -845,9 +847,9 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
   /* now we need to fix any directory permissions that were 
      modified during the transfer */
   for (i = 0; i < flist->count; i++) {
-         struct file_struct *file = &flist->files[i];
-         if (!file->name || !S_ISDIR(file->mode)) continue;
-         recv_generator(file->name,flist,i,-1);
+         struct file_struct *file = flist->files[i];
+         if (!file->basename || !S_ISDIR(file->mode)) continue;
+         recv_generator(f_name(file),flist,i,-1);
   }
 
   if (verbose > 2)
@@ -891,20 +893,20 @@ off_t send_files(struct file_list *flist,int f_out,int f_in)
        break;
       }
 
-      file = &flist->files[i];
+      file = flist->files[i];
 
       fname[0] = 0;
-      if (file->dir) {
-       strncpy(fname,file->dir,MAXPATHLEN-1);
-       fname[MAXPATHLEN-1] = 0;
-      if (strlen(fname) == MAXPATHLEN-1) {
-        fprintf(FERROR, "send_files failed on long-named directory %s\n",
-                fname);
-        return -1;
-      }
-       strcat(fname,"/");
+      if (file->basedir) {
+             strncpy(fname,file->basedir,MAXPATHLEN-1);
+             fname[MAXPATHLEN-1] = 0;
+             if (strlen(fname) == MAXPATHLEN-1) {
+                     fprintf(FERROR, "send_files failed on long-named directory %s\n",
+                             fname);
+                     return -1;
+             }
+             strcat(fname,"/");
       }
-      strncat(fname,file->name,MAXPATHLEN-strlen(fname));
+      strncat(fname,f_name(file),MAXPATHLEN-strlen(fname));
 
       if (verbose > 2) 
        fprintf(FERROR,"send_files(%d,%s)\n",i,fname);
@@ -995,9 +997,9 @@ void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
            (int)getpid(),flist->count);
 
   for (i = 0; i < flist->count; i++) {
-    struct file_struct *file = &flist->files[i];
+    struct file_struct *file = flist->files[i];
     mode_t saved_mode = file->mode;
-    if (!file->name) continue;
+    if (!file->basename) continue;
 
     /* we need to ensure that any directories we create have writeable
        permissions initially so that we can create the files within
@@ -1006,7 +1008,7 @@ void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
       file->mode |= S_IWUSR; /* user write */
     }
 
-    recv_generator(local_name?local_name:file->name,
+    recv_generator(local_name?local_name:f_name(file),
                   flist,i,f);
 
     file->mode = saved_mode;
@@ -1026,8 +1028,8 @@ void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
     /* in newer versions of the protocol the files can cycle through
        the system more than once to catch initial checksum errors */
     for (i=read_int(f_recv); i != -1; i=read_int(f_recv)) {
-      struct file_struct *file = &flist->files[i];
-      recv_generator(local_name?local_name:file->name,
+      struct file_struct *file = flist->files[i];
+      recv_generator(local_name?local_name:f_name(file),
                     flist,i,f);    
     }
 

diff --git a/rsync.h b/rsync.h
index cef172a..2ee5e03 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -40,7 +40,7 @@
 
 /* update this if you make incompatible changes */
 #define PROTOCOL_VERSION 15
-#define MIN_PROTOCOL_VERSION 10
+#define MIN_PROTOCOL_VERSION 11
 #define MAX_PROTOCOL_VERSION 20
 
 #define SPARSE_WRITE_SIZE (4*1024)
@@ -211,24 +211,25 @@
 #endif
 
 struct file_struct {
-  time_t modtime;
-  off_t length;
-  mode_t mode;
-  ino_t inode;
-  dev_t dev;
-  dev_t rdev;
-  uid_t uid;
-  gid_t gid;
-  char *name;
-  char *dir;
-  char *link;
-  char sum[MD4_SUM_LENGTH];
+       time_t modtime;
+       off_t length;
+       mode_t mode;
+       ino_t inode;
+       dev_t dev;
+       dev_t rdev;
+       uid_t uid;
+       gid_t gid;
+       char *basename;
+       char *dirname;
+       char *basedir;
+       char *link;
+       char sum[MD4_SUM_LENGTH];
 };
 
 struct file_list {
   int count;
   int malloced;
-  struct file_struct *files;
+  struct file_struct **files;
 };
 
 struct sum_buf {
@@ -257,7 +258,7 @@ struct map_struct {
    without breaking existing versions */
 static int flist_up(struct file_list *flist, int i)
 {
-       while (!flist->files[i].name) i++;
+       while (!flist->files[i]->basename) i++;
        return i;
 }
 

diff --git a/uidlist.c b/uidlist.c
index b7d84ce..962bb8c 100644 (file)
--- a/uidlist.c
+++ b/uidlist.c
@@ -300,11 +300,11 @@ void recv_uid_list(int f, struct file_list *flist)
        /* now convert the uid/gid of all files in the list to the mapped
           uid/gid */
        for (i=0;i<flist->count;i++) {
-               if (preserve_uid && flist->files[i].uid != 0) {
-                       flist->files[i].uid = match_uid(flist->files[i].uid);
+               if (preserve_uid && flist->files[i]->uid != 0) {
+                       flist->files[i]->uid = match_uid(flist->files[i]->uid);
                }
-               if (preserve_gid && flist->files[i].gid != 0) {
-                       flist->files[i].gid = match_gid(flist->files[i].gid);
+               if (preserve_gid && flist->files[i]->gid != 0) {
+                       flist->files[i]->gid = match_gid(flist->files[i]->gid);
                }
        }
 }