remove double / from filenames in display

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index a4f06f1..6543462 100644 (file)
--- 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);
@@ -69,9 +47,19 @@ void log_open(void)
        if (initialised) return;
        initialised = 1;
 
+       /* 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);
+
+       /* 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;
        }
 
@@ -88,12 +76,6 @@ void log_open(void)
 #ifndef LOG_NDELAY
        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);
 }
                
 
@@ -106,11 +88,6 @@ void log_open(void)
        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);
@@ -124,14 +101,18 @@ void log_open(void)
 
        if (fd == FLOG) {
                if (am_daemon) logit(LOG_INFO, buf);
-               depth--;
                return;
        }
 
        if (am_daemon) {
+               static int depth;
                int priority = LOG_INFO;
                if (fd == FERROR) priority = LOG_WARNING;
 
+               if (depth) return;
+
+               depth++;
+
                log_open();
                if (!io_multiplex_write(fd, buf, strlen(buf))) {
                        logit(priority, buf);
@@ -158,8 +139,6 @@ void log_open(void)
        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)
@@ -195,13 +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);
        
@@ -224,7 +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;
@@ -238,7 +253,7 @@ static void log_formatted(char *op, struct file_struct *file)
                }
 
                if (l != 2) {
-                       memmove(s+(l-1), s+1, strlen(s+1));
+                       memmove(s+(l-1), s+1, strlen(s+1)+1);
                }
                memcpy(p, n, l);
 
@@ -249,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);
        }
 }