X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f7632fc60d69c8dabed600ede87f0b91319a3b7f..263cf2ed554ed3cf21c4710ae4c5053121ba20d8:/log.c

diff --git a/log.c b/log.c
index 732a96b7..65434620 100644
--- a/log.c
+++ b/log.c
@@ -174,14 +174,18 @@ void rflush(int fd)
 
 /* a generic logging routine for send/recv, with parameter
    substitiution */
-static void log_formatted(char *op, struct file_struct *file)
+static void log_formatted(char *op, struct file_struct *file,
+			  struct stats *initial_stats)
 {
 	extern int module_id;
 	extern char *auth_user;
 	char buf[1024];
+	char buf2[1024];
 	char *p, *s, *n;
-	char buf2[100];
 	int l;
+	extern struct stats stats;		
+	extern int am_sender;
+	int64 b;
 
 	strlcpy(buf, lp_log_format(module_id), sizeof(buf)-1);
 	
@@ -204,10 +208,38 @@ static void log_formatted(char *op, struct file_struct *file)
 			n = buf2;
 			break;
 		case 'o': n = op; break;
-		case 'f': n = f_name(file); break;
+		case 'f': 
+			slprintf(buf2, sizeof(buf2)-1, "%s/%s", 
+				 file->basedir?file->basedir:"", 
+				 f_name(file));
+			clean_fname(buf2);
+			n = buf2; 
+			break;
 		case 'm': n = lp_name(module_id); break;
 		case 'P': n = lp_path(module_id); break;
 		case 'u': n = auth_user; break;
+		case 'b': 
+			if (am_sender) {
+				b = stats.total_written - 
+					initial_stats->total_written;
+			} else {
+				b = stats.total_read - 
+					initial_stats->total_read;
+			}
+			slprintf(buf2,sizeof(buf2)-1,"%.0f", (double)b); 
+			n = buf2;
+			break;
+		case 'c': 
+			if (!am_sender) {
+				b = stats.total_written - 
+					initial_stats->total_written;
+			} else {
+				b = stats.total_read - 
+					initial_stats->total_read;
+			}
+			slprintf(buf2,sizeof(buf2)-1,"%.0f", (double)b); 
+			n = buf2;
+			break;
 		}
 
 		if (!n) continue;
@@ -232,20 +264,20 @@ static void log_formatted(char *op, struct file_struct *file)
 }
 
 /* log the outgoing transfer of a file */
-void log_send(struct file_struct *file)
+void log_send(struct file_struct *file, struct stats *initial_stats)
 {
 	extern int module_id;
 	if (lp_transfer_logging(module_id)) {
-		log_formatted("send", file);
+		log_formatted("send", file, initial_stats);
 	}
 }
 
 /* log the incoming transfer of a file */
-void log_recv(struct file_struct *file)
+void log_recv(struct file_struct *file, struct stats *initial_stats)
 {
 	extern int module_id;
 	if (lp_transfer_logging(module_id)) {
-		log_formatted("recv", file);
+		log_formatted("recv", file, initial_stats);
 	}
 }