check for a broken inet_ntoa() on IRIX

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index a4f06f1..e06617a 100644 (file)
--- a/log.c
+++ b/log.c
@@ -106,11 +106,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 +119,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 +157,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)
@@ -238,7 +235,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);