X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/740819ef7b3b96451e16b2fa3891d46cfc73ec64..582250008b4d5552d73b0eb36a6776bd3b8622b5:/flist.c

diff --git a/flist.c b/flist.c
index d9b0da7a..b3e1a933 100644
--- 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,14 @@
    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.
+ *
+ **/
 
 #include "rsync.h"
 
@@ -59,6 +66,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 +333,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
 
@@ -409,8 +452,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
   
@@ -464,7 +512,8 @@ static int skip_filesystem(char *fname, STRUCT_STAT *st)
 }
 
 #define STRDUP(ap, p)	(ap ? string_area_strdup(ap, p) : strdup(p))
-#define MALLOC(ap, i)	(ap ? string_area_malloc(ap, i) : malloc(i))
+/* IRIX cc cares that the operands to the ternary have the same type. */
+#define MALLOC(ap, i)	(ap ? (void*) string_area_malloc(ap, i) : malloc(i))
 
 /* create a file_struct for a named file */
 struct file_struct *make_file(int f, char *fname, struct string_area **ap,
@@ -606,7 +655,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)
@@ -697,6 +749,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;
@@ -707,7 +764,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);
@@ -830,8 +887,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);
 	
@@ -1084,6 +1140,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_