hanle null strings in -vvv output

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index 90b287e..21b5c1c 100644 (file)
--- a/log.c
+++ b/log.c
@@ -23,15 +23,58 @@
   */
 #include "rsync.h"
 
+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);
+               fflush(logfile);
+       } else {
+               syslog(priority, "%s", buf);
+       }
+}
 
 void log_open(void)
 {
        static int initialised;
        int options = LOG_PID;
+       time_t t;
+       char *logf;
 
        if (initialised) return;
        initialised = 1;
 
+       logf = lp_log_file();
+       if (logf && *logf) {
+               logfile = fopen(logf, "a");
+               return;
+       }
+
 #ifdef LOG_NDELAY
        options |= LOG_NDELAY;
 #endif
@@ -43,8 +86,14 @@ void log_open(void)
 #endif
 
 #ifndef LOG_NDELAY
-       syslog(LOG_INFO,"rsyncd started\n");
+       logit(LOG_INFO,"rsyncd started\n");
 #endif
+
+       /* this looks pointless, but it is needed in order for the
+          C library on some systems to fetch the timezone info
+          before the chroot */
+       t = time(NULL);
+       localtime(&t);
 }
                
 
@@ -56,6 +105,12 @@ void rprintf(int fd, const char *format, ...)
        int len;
        FILE *f=NULL;
        extern int am_daemon;
+       /* recursion can happen with certain fatal conditions */
+       static int depth;
+
+       if (depth) return;
+
+       depth++;
 
        va_start(ap, format);
        len = vslprintf(buf, sizeof(buf)-1, format, ap);
@@ -67,12 +122,22 @@ 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;
 
                log_open();
-               syslog(priority, "%s", buf);
+               if (!io_multiplex_write(fd, buf, strlen(buf))) {
+                       logit(priority, buf);
+               }
+
+               depth--;
                return;
        }
 
@@ -91,6 +156,10 @@ void rprintf(int fd, const char *format, ...)
        if (!f) exit_cleanup(1);
 
        if (fwrite(buf, len, 1, f) != 1) exit_cleanup(1);
+
+       if (buf[len-1] == '\r' || buf[len-1] == '\n') fflush(f);
+
+       depth--;
 }
 
 void rflush(int fd)
@@ -118,3 +187,51 @@ 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));
+       }
+}
+
+/* called when the transfer is interrupted for some reason */
+void log_exit(int code)
+{
+       if (code == 0) {
+               extern struct stats stats;              
+               rprintf(FLOG,"wrote %.0f bytes  read %.0f bytes  total size %.0f\n",
+                       (double)stats.total_written,
+                       (double)stats.total_read,
+                       (double)stats.total_size);
+       } else {
+               rprintf(FLOG,"transfer interrupted\n");
+       }
+}
+
+/* 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);
+}
+