X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4f6325c362b7b7e35e6728bb5c101e9ab5215092..106005004ec79d27c897a338a80eca8941208914:/log.c

diff --git a/log.c b/log.c
index b727a53d..a5867932 100644
--- a/log.c
+++ b/log.c
@@ -25,10 +25,33 @@
 
 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", buf);
+		fprintf(logfile,"%s  %s", timestring(), buf);
 		fflush(logfile);
 	} else {
 		syslog(priority, "%s", buf);
@@ -96,6 +119,12 @@ void rprintf(int fd, const char *format, ...)
 
 	buf[len] = 0;
 
+	if (fd == FLOG) {
+		if (am_daemon) logit(LOG_INFO, buf);
+		depth--;
+		return;
+	}
+
 	if (am_daemon) {
 		int priority = LOG_INFO;
 		if (fd == FERROR) priority = LOG_WARNING;
@@ -155,3 +184,36 @@ void rflush(int fd)
 	fflush(f);
 }
 
+
+/* log the outgoing transfer of a file */
+void log_send(struct file_struct *file)
+{
+	extern int module_id;
+	if (lp_transfer_logging(module_id)) {
+		rprintf(FLOG,"Sending %s [%s] %.0f %s\n",
+			client_name(0), client_addr(0),
+			(double)file->length, f_name(file));
+	}
+}
+
+/* log the incoming transfer of a file */
+void log_recv(struct file_struct *file)
+{
+	extern int module_id;
+	if (lp_transfer_logging(module_id)) {
+		rprintf(FLOG,"Receiving %s [%s] %.0f %s\n",
+			client_name(0), client_addr(0),
+			(double)file->length, f_name(file));
+	}
+}
+
+/* log the incoming transfer of a file for interactive use, this
+   will be called at the end where the client was run */
+void log_transfer(struct file_struct *file, char *fname)
+{
+	extern int verbose;
+
+	if (!verbose) return;
+
+	rprintf(FINFO,"%s\n", fname);
+}