hanle null strings in -vvv output

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index 18db19a..21b5c1c 100644 (file)
--- a/log.c
+++ b/log.c
@@ -51,7 +51,8 @@ static char *timestring(void )
 static void logit(int priority, char *buf)
 {
        if (logfile) {
-               fprintf(logfile,"%s  %s", timestring(), buf);
+               fprintf(logfile,"%s [%d] %s", 
+                       timestring(), (int)getpid(), buf);
                fflush(logfile);
        } else {
                syslog(priority, "%s", buf);
@@ -63,12 +64,14 @@ void log_open(void)
        static int initialised;
        int options = LOG_PID;
        time_t t;
+       char *logf;
 
        if (initialised) return;
        initialised = 1;
 
-       if (lp_log_file()) {
-               logfile = fopen(lp_log_file(), "a");
+       logf = lp_log_file();
+       if (logf && *logf) {
+               logfile = fopen(logf, "a");
                return;
        }
 
@@ -119,6 +122,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;
@@ -178,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);
+}
+