X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/2e7d19945c6fa8ff4a2dbd4561cc499e94ac56c4..b23c29063064570b1d9f7d8922251455a85927bd:/flist.c

diff --git a/flist.c b/flist.c
index 8ec488c6..ead49665 100644
--- a/flist.c
+++ b/flist.c
@@ -34,6 +34,7 @@
 extern struct stats stats;
 
 extern int verbose;
+extern int do_progress;
 extern int am_server;
 extern int always_checksum;
 
@@ -69,32 +70,44 @@ static struct file_struct null_file;
 static void clean_flist(struct file_list *flist, int strip_root);
 
 
-static int show_build_progress_p(void)
+static int show_filelist_p(void)
 {
-	extern int do_progress;
+	return verbose && recurse && !am_server;
+}
 
-	return do_progress && verbose && recurse && !am_server;
+static void start_filelist_progress(char *kind)
+{
+	rprintf(FINFO, "%s ... ", kind);
+	if ((verbose > 1) || do_progress)
+		rprintf(FINFO, "\n");
+	rflush(FINFO);
 }
 
-/**
- * True if we're local, etc, and should emit progress emssages.
- **/
-static void emit_build_progress(const struct file_list *flist)
+
+static void emit_filelist_progress(const struct file_list *flist)
 {
 	rprintf(FINFO, " %d files...\r", flist->count);
 }
 
 
-static void finish_build_progress(const struct file_list *flist)
+static void maybe_emit_filelist_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);
-	}
+	if (do_progress && show_filelist_p() && ((flist->count % 100) == 0))
+		emit_filelist_progress(flist);
 }
 
 
+static void finish_filelist_progress(const struct file_list *flist)
+{
+	if (do_progress) {
+		/* This overwrites the progress line */
+		rprintf(FINFO, "%d file%sto consider\n",
+			flist->count, flist->count == 1 ? " " : "s ");
+	} else {
+		rprintf(FINFO, "done\n");
+	}
+}
+
 void show_flist_stats(void)
 {
 	/* Nothing yet */
@@ -289,10 +302,13 @@ static void flist_expand(struct file_list *flist)
 
 		new_bytes = sizeof(flist->files[0]) * flist->malloced;
 		
-		new_ptr = realloc(flist->files, new_bytes);
+		if (flist->files)
+			new_ptr = realloc(flist->files, new_bytes);
+		else
+			new_ptr = malloc(new_bytes);
 
-		if (verbose > 2) {
-			rprintf(FINFO, RSYNC_NAME ": expand file_list to %.0f bytes, did%s move\n",
+		if (verbose >= 2) {
+			rprintf(FINFO, "expand file_list to %.0f bytes, did%s move\n",
 				(double) new_bytes,
 				(new_ptr == flist->files) ? " not" : "");
 		}
@@ -311,7 +327,7 @@ static void send_file_entry(struct file_struct *file, int f,
 	unsigned char flags;
 	static time_t last_time;
 	static mode_t last_mode;
-	static dev_t last_rdev;
+	static DEV64_T last_rdev;
 	static uid_t last_uid;
 	static gid_t last_gid;
 	static char lastname[MAXPATHLEN];
@@ -430,7 +446,7 @@ static void receive_file_entry(struct file_struct **fptr,
 {
 	static time_t last_time;
 	static mode_t last_mode;
-	static dev_t last_rdev;
+	static DEV64_T last_rdev;
 	static uid_t last_uid;
 	static gid_t last_gid;
 	static char lastname[MAXPATHLEN];
@@ -590,7 +606,21 @@ static int skip_filesystem(char *fname, STRUCT_STAT * st)
 /* 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 */
+/**
+ * Create a file_struct for a named file by reading its stat()
+ * information and performing extensive checks against global
+ * options.
+ *
+ * @return the new file, or NULL if there was an error or this file
+ * should be excluded.
+ *
+ * @todo There is a small optimization opportunity here to avoid
+ * stat()ing the file in some circumstances, which has a certain cost.
+ * We are called immediately after doing readdir(), and so we may
+ * already know the d_type of the file.  We could for example avoid
+ * statting directories if we're not recursing, but this is not a very
+ * important case.  Some systems may not have d_type.
+ **/
 struct file_struct *make_file(int f, char *fname, struct string_area **ap,
 			      int noexcludes)
 {
@@ -682,7 +712,7 @@ struct file_struct *make_file(int f, char *fname, struct string_area **ap,
 	file->gid = st.st_gid;
 	file->dev = st.st_dev;
 	file->inode = st.st_ino;
-#ifdef HAVE_ST_RDEV
+#ifdef HAVE_STRUCT_STAT_ST_RDEV
 	file->rdev = st.st_rdev;
 #endif
 
@@ -736,8 +766,7 @@ void send_file_name(int f, struct file_list *flist, char *fname,
 	if (!file)
 		return;
 
-	if (show_build_progress_p() & !(flist->count % 100))
-		emit_build_progress(flist);
+	maybe_emit_filelist_progress(flist);
 
 	flist_expand(flist);
 
@@ -836,12 +865,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	struct file_list *flist;
 	int64 start_write;
 
-	if (verbose && recurse && !am_server && f != -1) {
-		rprintf(FINFO, RSYNC_NAME ": building file list...\n");
-		if (verbose > 1)
-			rprintf(FINFO, "\n");
-		rflush(FINFO);
-	}
+	if (show_filelist_p() && f != -1)
+		start_filelist_progress("building file list");
 
 	start_write = stats.total_written;
 
@@ -963,7 +988,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		send_file_entry(NULL, f, 0);
 	}
 
-	finish_build_progress(flist);
+	if (show_filelist_p() && f != -1) {
+		finish_filelist_progress(flist);
+	}
 
 	clean_flist(flist, 0);
 
@@ -980,7 +1007,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	}
 
 	if (f != -1) {
-		io_end_buffering(f);
+		io_end_buffering();
 		stats.flist_size = stats.total_written - start_write;
 		stats.num_files = flist->count;
 		if (write_batch)	/*  dw  */
@@ -1001,10 +1028,8 @@ struct file_list *recv_file_list(int f)
 	int64 start_read;
 	extern int list_only;
 
-	if (verbose && recurse && !am_server) {
-		rprintf(FINFO, "receiving file list ... ");
-		rflush(FINFO);
-	}
+	if (show_filelist_p())
+		start_filelist_progress("receiving file list");
 
 	start_read = stats.total_read;
 
@@ -1033,6 +1058,8 @@ struct file_list *recv_file_list(int f)
 
 		flist->count++;
 
+		maybe_emit_filelist_progress(flist);
+
 		if (verbose > 2)
 			rprintf(FINFO, "recv_file_name(%s)\n",
 				f_name(flist->files[i]));
@@ -1044,8 +1071,8 @@ struct file_list *recv_file_list(int f)
 
 	clean_flist(flist, relative_paths);
 
-	if (verbose && recurse && !am_server) {
-		rprintf(FINFO, "done\n");
+	if (show_filelist_p()) {
+		finish_filelist_progress(flist);
 	}
 
 	/* now recv the uid/gid list. This was introduced in protocol version 15 */