patch from Jim Meyering <meyering@eng.ascend.com>

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 38569aa..1ae8c34 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -30,6 +30,8 @@ extern off_t total_size;
 
 extern int cvs_exclude;
 
+extern int recurse;
+
 extern int one_file_system;
 extern int make_backups;
 extern int preserve_links;
@@ -39,6 +41,7 @@ extern int preserve_devices;
 extern int preserve_uid;
 extern int preserve_gid;
 extern int preserve_times;
+extern int relative_paths;
 
 static char **local_exclude_list = NULL;
 
@@ -110,7 +113,7 @@ void send_file_entry_v11(struct file_struct *file,int f)
 
   if (l1 > 0) flags |= SAME_NAME;
   if (l2 > 255) flags |= LONG_NAME;
-    
+
   write_byte(f,flags);  
   if (flags & SAME_NAME)
     write_byte(f,l1);
@@ -165,7 +168,7 @@ void send_file_entry_v11(struct file_struct *file,int f)
 void receive_file_entry_v11(struct file_struct *file,
                            unsigned char flags,int f)
 {
-  static mode_t last_time=0;
+  static time_t last_time=0;
   static mode_t last_mode=0;
   static dev_t last_rdev=0;
   static uid_t last_uid=0;
@@ -232,7 +235,7 @@ void receive_file_entry_v11(struct file_struct *file,
 
 
 
-static struct file_struct *make_file(int recurse,char *fname)
+static struct file_struct *make_file(char *fname)
 {
   static struct file_struct file;
   struct stat st;
@@ -304,25 +307,27 @@ static struct file_struct *make_file(int recurse,char *fname)
 
 
 
-static void send_file_name(int f,struct file_list *flist,
-                          int recurse,char *fname)
+static void send_file_name(int f,struct file_list *flist,char *fname)
 {
   struct file_struct *file;
 
-  file = make_file(recurse,fname);
+  file = make_file(fname);
 
   if (!file) return;  
   
   if (flist->count >= flist->malloced) {
-    flist->malloced += 100;
-    flist->files = (struct file_struct *)realloc(flist->files,
-                                                sizeof(flist->files[0])*
-                                                flist->malloced);
-    if (!flist->files)
-      out_of_memory("send_file_name");
+         if (flist->malloced < 100)
+                 flist->malloced += 100;
+         else
+                 flist->malloced *= 1.8;
+         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,".") && strcmp(file->name,"/")) {
+  if (strcmp(file->name,"/")) {
     flist->files[flist->count++] = *file;    
     send_file_entry(file,f);
   }
@@ -368,7 +373,7 @@ static void send_directory(int f,struct file_list *flist,char *dir)
        strcmp(di->d_name,"..")==0)
       continue;
     strcpy(p,di->d_name);
-    send_file_name(f,flist,1,fname);
+    send_file_name(f,flist,fname);
   }
 
   closedir(d);
@@ -376,7 +381,7 @@ static void send_directory(int f,struct file_list *flist,char *dir)
 
 
 
-struct file_list *send_file_list(int f,int recurse,int argc,char *argv[])
+struct file_list *send_file_list(int f,int argc,char *argv[])
 {
   int i,l;
   struct stat st;
@@ -384,7 +389,7 @@ struct file_list *send_file_list(int f,int recurse,int argc,char *argv[])
   char dbuf[MAXPATHLEN];
   struct file_list *flist;
 
-  if (verbose && recurse) {
+  if (verbose && recurse && !am_server) {
     fprintf(FINFO,"building file list ... ");
     fflush(FINFO);
   }
@@ -420,12 +425,19 @@ struct file_list *send_file_list(int f,int recurse,int argc,char *argv[])
     }
 
     dir = NULL;
-    p = strrchr(fname,'/');
-    if (p) {
-      *p = 0;
-      dir = fname;
-      fname = p+1;      
+
+    if (!relative_paths) {
+           p = strrchr(fname,'/');
+           if (p) {
+                   *p = 0;
+                   if (p == fname) 
+                           dir = "/";
+                   else
+                           dir = fname;      
+                   fname = p+1;      
+           }
     }
+
     if (!*fname)
       fname = ".";
 
@@ -441,7 +453,7 @@ struct file_list *send_file_list(int f,int recurse,int argc,char *argv[])
       flist_dir = dir;
       if (one_file_system)
        set_filesystem(fname);
-      send_file_name(f,flist,recurse,fname);
+      send_file_name(f,flist,fname);
       flist_dir = NULL;
       if (chdir(dbuf) != 0) {
        fprintf(FERROR,"chdir %s : %s\n",dbuf,strerror(errno));
@@ -452,7 +464,7 @@ struct file_list *send_file_list(int f,int recurse,int argc,char *argv[])
 
     if (one_file_system)
       set_filesystem(fname);
-    send_file_name(f,flist,recurse,fname);
+    send_file_name(f,flist,fname);
   }
 
   if (f != -1) {
@@ -460,7 +472,7 @@ struct file_list *send_file_list(int f,int recurse,int argc,char *argv[])
     write_flush(f);
   }
 
-  if (verbose && recurse)
+  if (verbose && recurse && !am_server)
     fprintf(FINFO,"done\n");
 
   clean_flist(flist);
@@ -474,8 +486,10 @@ struct file_list *recv_file_list(int f)
   struct file_list *flist;
   unsigned char flags;
 
-  if (verbose > 2)
-    fprintf(FERROR,"recv_file_list starting\n");
+  if (verbose && recurse && !am_server) {
+    fprintf(FINFO,"receiving file list ... ");
+    fflush(FINFO);
+  }
 
   flist = (struct file_list *)malloc(sizeof(flist[0]));
   if (!flist)
@@ -493,12 +507,15 @@ struct file_list *recv_file_list(int f)
     int i = flist->count;
 
     if (i >= flist->malloced) {
-      flist->malloced += 100;
-      flist->files =(struct file_struct *)realloc(flist->files,
-                                                 sizeof(flist->files[0])*
-                                                 flist->malloced);
-      if (!flist->files)
-       goto oom;
+         if (flist->malloced < 100)
+                 flist->malloced += 100;
+         else
+                 flist->malloced *= 1.8;
+         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);
@@ -518,6 +535,10 @@ struct file_list *recv_file_list(int f)
 
   clean_flist(flist);
 
+  if (verbose && recurse && !am_server) {
+    fprintf(FINFO,"done\n");
+  }
+
   return flist;
 
 oom: