Add link to the message that introduced string_area.

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 0b0fd23..c28159a 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -1,7 +1,7 @@
 /* 
    Copyright (C) Andrew Tridgell 1996
    Copyright (C) Paul Mackerras 1996
-   Copyright (C) 2001 by Martin Pool <mbp@samba.org>
+   Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,7 +18,16 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-/* generate and receive file lists */
+/** @file flist.c
+ * Generate and receive file lists
+ *
+ * @todo Get rid of the string_area optimization.  Efficiently
+ * allocating blocks is the responsibility of the system's malloc
+ * library, not of rsync.
+ *
+ * @sa http://lists.samba.org/pipermail/rsync/2000-June/002351.html
+ *
+ **/
 
 #include "rsync.h"
 
@@ -59,6 +68,35 @@ static struct file_struct null_file;
 
 static void clean_flist(struct file_list *flist, int strip_root);
 
+
+static int show_build_progress_p(void)
+{
+       extern int do_progress;
+       
+       return do_progress && verbose && recurse && !am_server;
+}
+
+/**
+ * True if we're local, etc, and should emit progress emssages.
+ **/
+static void emit_build_progress(const struct file_list *flist)
+{
+       rprintf(FINFO,
+               " %d files...\r",
+               flist->count);
+}
+
+
+static void finish_build_progress(const struct file_list *flist)
+{
+       if (verbose && recurse && !am_server) {
+               /* This overwrites the progress line, if any. */
+               rprintf(FINFO, RSYNC_NAME ": %d files to consider.\n",
+                       flist->count);
+       }
+}
+
+
 static struct string_area *string_area_new(int size)
 {
        struct string_area *a;
@@ -297,8 +335,15 @@ static void send_file_entry(struct file_struct *file,int f,unsigned base_flags)
 
 #if SUPPORT_HARD_LINKS
        if (preserve_hard_links && S_ISREG(file->mode)) {
-               write_int(f,(int)file->dev);
-               write_int(f,(int)file->inode);
+               if (remote_version < 26) {
+                       /* 32-bit dev_t and ino_t */
+                       write_int(f,(int)file->dev);
+                       write_int(f,(int)file->inode);
+               } else {
+                       /* 64-bit dev_t and ino_t */
+                       write_longint(f, file->dev);
+                       write_longint(f, file->inode);
+               }
        }
 #endif
 
@@ -332,7 +377,7 @@ static void receive_file_entry(struct file_struct **fptr,
        static gid_t last_gid;
        static char lastname[MAXPATHLEN];
        char thisname[MAXPATHLEN];
-       int l1=0,l2=0;
+       unsigned int l1=0,l2=0;
        char *p;
        struct file_struct *file;
 
@@ -399,6 +444,10 @@ static void receive_file_entry(struct file_struct **fptr,
 
        if (preserve_links && S_ISLNK(file->mode)) {
                int l = read_int(f);
+               if (l < 0) {
+                       rprintf(FERROR,"overflow: l=%d\n", l);
+                       overflow("receive_file_entry");
+               }
                file->link = (char *)malloc(l+1);
                if (!file->link) out_of_memory("receive_file_entry 2");
                read_sbuf(f,file->link,l);
@@ -409,8 +458,13 @@ static void receive_file_entry(struct file_struct **fptr,
 
 #if SUPPORT_HARD_LINKS
        if (preserve_hard_links && S_ISREG(file->mode)) {
-               file->dev = read_int(f);
-               file->inode = read_int(f);
+               if (remote_version < 26) {
+                       file->dev = read_int(f);
+                       file->inode = read_int(f);
+               } else {
+                       file->dev = read_longint(f);
+                       file->inode = read_longint(f);
+               }
        }
 #endif
   
@@ -607,7 +661,10 @@ void send_file_name(int f,struct file_list *flist,char *fname,
 
   file = make_file(f,fname, &flist->string_area, 0);
 
-  if (!file) return;  
+  if (!file) return;
+
+  if (show_build_progress_p() & !(flist->count % 100))
+         emit_build_progress(flist);
   
   if (flist->count >= flist->malloced) {
          if (flist->malloced < 1000)
@@ -698,6 +755,11 @@ static void send_directory(int f,struct file_list *flist,char *dir)
 }
 
 
+/*
+ *
+ * I *think* f==-1 means that the list should just be built in memory
+ * and not transmitted.  But who can tell? -- mbp
+ */
 struct file_list *send_file_list(int f,int argc,char *argv[])
 {
        int i,l;
@@ -708,7 +770,7 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
        int64 start_write;
 
        if (verbose && recurse && !am_server && f != -1) {
-               rprintf(FINFO,"building file list ... ");
+               rprintf(FINFO, RSYNC_NAME ": building file list...\n");
                 if (verbose > 1)
                         rprintf(FINFO, "\n");
                rflush(FINFO);
@@ -831,8 +893,7 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
                send_file_entry(NULL,f,0);
        }
 
-       if (verbose && recurse && !am_server && f != -1)
-               rprintf(FINFO,"done\n");
+       finish_build_progress(flist);
        
        clean_flist(flist, 0);
        
@@ -963,6 +1024,10 @@ oom:
 }
 
 
+/*
+ * XXX: This is currently the hottest function while building the file
+ * list, because building f_name()s every time is expensive.
+ **/
 int file_compare(struct file_struct **f1,struct file_struct **f2)
 {
        if (!(*f1)->basename && !(*f2)->basename) return 0;
@@ -1085,6 +1150,10 @@ static void clean_flist(struct file_list *flist, int strip_root)
                } 
        }
 
+       /* FIXME: There is a bug here when filenames are repeated more
+        * than once, because we don't handle freed files when doing
+        * the comparison. */
+
        if (strip_root) {
                /* we need to strip off the root directory in the case
                   of relative paths, but this must be done _after_
@@ -1120,6 +1189,10 @@ static void clean_flist(struct file_list *flist, int strip_root)
 
 /*
  * return the full filename of a flist entry
+ *
+ * This function is too expensive at the moment, because it copies
+ * strings when often we only want to compare them.  In any case,
+ * using strlcat is silly because it will walk the string repeatedly.
  */
 char *f_name(struct file_struct *f)
 {
@@ -1132,9 +1205,11 @@ char *f_name(struct file_struct *f)
        n = (n+1)%10;
 
        if (f->dirname) {
-               strlcpy(p, f->dirname, MAXPATHLEN);
-               strlcat(p, "/", MAXPATHLEN);
-               strlcat(p, f->basename, MAXPATHLEN);
+               int off;
+
+               off = strlcpy(p, f->dirname, MAXPATHLEN);
+               off += strlcpy(p+off, "/", MAXPATHLEN-off);
+               off += strlcpy(p+off, f->basename, MAXPATHLEN-off);
        } else {
                strlcpy(p, f->basename, MAXPATHLEN);
        }