X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/958f373550a93532a2df9c7f5242befb29f3a6e8..654175798bdbdd6403e10c8fa74e8586b3612ea1:/log.c

diff --git a/log.c b/log.c
index 30aca47e..18e1da06 100644
--- a/log.c
+++ b/log.c
@@ -26,33 +26,11 @@
 static FILE *logfile;
 
 
-/****************************************************************************
-  return the date and time as a string
-****************************************************************************/
-static char *timestring(void )
-{
-	static char TimeBuf[200];
-	time_t t = time(NULL);
-	struct tm *tm = localtime(&t);
-
-#ifdef HAVE_STRFTIME
-	strftime(TimeBuf,sizeof(TimeBuf)-1,"%Y/%m/%d %T",tm);
-#else
-	strlcpy(TimeBuf, asctime(tm), sizeof(TimeBuf)-1);
-#endif
-
-	if (TimeBuf[strlen(TimeBuf)-1] == '\n') {
-		TimeBuf[strlen(TimeBuf)-1] = 0;
-	}
-
-	return(TimeBuf);
-}
-
 static void logit(int priority, char *buf)
 {
 	if (logfile) {
 		fprintf(logfile,"%s [%d] %s", 
-			timestring(), (int)getpid(), buf);
+			timestring(time(NULL)), (int)getpid(), buf);
 		fflush(logfile);
 	} else {
 		syslog(priority, "%s", buf);
@@ -78,7 +56,10 @@ void log_open(void)
 	/* optionally use a log file instead of syslog */
 	logf = lp_log_file();
 	if (logf && *logf) {
+		extern int orig_umask;
+		int old_umask = umask(022 | orig_umask);
 		logfile = fopen(logf, "a");
+		umask(old_umask);
 		return;
 	}
 
@@ -112,9 +93,9 @@ void log_open(void)
 	len = vslprintf(buf, sizeof(buf)-1, format, ap);
 	va_end(ap);
 
-	if (len < 0) exit_cleanup(1);
+	if (len < 0) exit_cleanup(RERR_MESSAGEIO);
 
-	if (len > sizeof(buf)-1) exit_cleanup(1);
+	if (len > sizeof(buf)-1) exit_cleanup(RERR_MESSAGEIO);
 
 	buf[len] = 0;
 
@@ -153,9 +134,9 @@ void log_open(void)
 			f = stdout;
 	} 
 
-	if (!f) exit_cleanup(1);
+	if (!f) exit_cleanup(RERR_MESSAGEIO);
 
-	if (fwrite(buf, len, 1, f) != 1) exit_cleanup(1);
+	if (fwrite(buf, len, 1, f) != 1) exit_cleanup(RERR_MESSAGEIO);
 
 	if (buf[len-1] == '\r' || buf[len-1] == '\n') fflush(f);
 }
@@ -185,7 +166,7 @@ void rflush(int fd)
 			f = stdout;
 	} 
 
-	if (!f) exit_cleanup(1);
+	if (!f) exit_cleanup(RERR_MESSAGEIO);
 	fflush(f);
 }
 
@@ -193,16 +174,21 @@ 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(int fd,
+			  char *format, 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);
+	strlcpy(buf, format, sizeof(buf)-1);
 	
 	for (s=&buf[0]; 
 	     s && (p=strchr(s,'%')); ) {
@@ -223,10 +209,40 @@ 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; 
+			if (*n == '/') n++;
+			break;
 		case 'm': n = lp_name(module_id); break;
+		case 't': n = timestring(time(NULL)); 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;
@@ -236,7 +252,7 @@ static void log_formatted(char *op, struct file_struct *file)
 		if ((l-1) + ((int)(s - &buf[0])) > sizeof(buf)) {
 			rprintf(FERROR,"buffer overflow expanding %%%c - exiting\n",
 				p[0]);
-			exit_cleanup(1);
+			exit_cleanup(RERR_MESSAGEIO);
 		}
 
 		if (l != 2) {
@@ -247,24 +263,34 @@ static void log_formatted(char *op, struct file_struct *file)
 		s = p+l;
 	}
 
-	rprintf(FLOG,"%s\n", buf);
+	rprintf(fd,"%s\n", buf);
 }
 
 /* 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;
+	extern int am_server;
+	extern char *log_format;
+
 	if (lp_transfer_logging(module_id)) {
-		log_formatted("send", file);
+		log_formatted(FLOG, lp_log_format(module_id), "send", file, initial_stats);
+	} else if (log_format && !am_server) {
+		log_formatted(FINFO, log_format, "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;
+	extern int am_server;
+	extern char *log_format;
+
 	if (lp_transfer_logging(module_id)) {
-		log_formatted("recv", file);
+		log_formatted(FLOG, lp_log_format(module_id), "send", file, initial_stats);
+	} else if (log_format && !am_server) {
+		log_formatted(FINFO, log_format, "send", file, initial_stats);
 	}
 }
 
@@ -278,12 +304,15 @@ void log_exit(int code)
 			(double)stats.total_read,
 			(double)stats.total_size);
 	} else {
-		rprintf(FLOG,"transfer interrupted\n");
+		rprintf(FLOG,"transfer interrupted (code %d)\n", code);
 	}
 }
 
 /* log the incoming transfer of a file for interactive use, this
-   will be called at the end where the client was run */
+   will be called at the end where the client was run 
+   
+   it i called when a file starts to be transferred
+*/
 void log_transfer(struct file_struct *file, char *fname)
 {
 	extern int verbose;