Update the copyright year.

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index 6d66e20..551cb06 100644 (file)
--- a/log.c
+++ b/log.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
  * Copyright (C) 2000-2001 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-2008 Wayne Davison
+ * Copyright (C) 2003-2009 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,8 @@
  */
 
 #include "rsync.h"
-#include "ifuncs.h"
+#include "itypes.h"
+#include "inums.h"
 
 extern int dry_run;
 extern int am_daemon;
@@ -56,7 +57,7 @@ extern iconv_t ic_chck;
 extern iconv_t ic_recv;
 #endif
 extern char curr_dir[MAXPATHLEN];
-extern char *module_dir;
+extern char *full_module_path;
 extern unsigned int module_dirlen;
 extern char sender_file_sum[MAX_DIGEST_LEN];
 
@@ -514,7 +515,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
                case 'l':
                        strlcat(fmt, "s", sizeof fmt);
                        snprintf(buf2, sizeof buf2, fmt,
-                                big_num(F_LENGTH(file), 0));
+                                comma_num(F_LENGTH(file)));
                        n = buf2;
                        break;
                case 'U':
@@ -617,7 +618,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
                        n = timestring(time(NULL));
                        break;
                case 'P':
-                       n = module_dir;
+                       n = full_module_path;
                        break;
                case 'u':
                        n = auth_user;
@@ -631,7 +632,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
                                        initial_stats->total_read;
                        }
                        strlcat(fmt, "s", sizeof fmt);
-                       snprintf(buf2, sizeof buf2, fmt, big_num(b, 0));
+                       snprintf(buf2, sizeof buf2, fmt, comma_num(b));
                        n = buf2;
                        break;
                case 'c':
@@ -643,7 +644,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
                                        initial_stats->total_read;
                        }
                        strlcat(fmt, "s", sizeof fmt);
-                       snprintf(buf2, sizeof buf2, fmt, big_num(b, 0));
+                       snprintf(buf2, sizeof buf2, fmt, comma_num(b));
                        n = buf2;
                        break;
                case 'C':
@@ -854,9 +855,9 @@ void log_exit(int code, const char *file, int line)
 {
        if (code == 0) {
                rprintf(FLOG,"sent %s bytes  received %s bytes  total size %s\n",
-                       big_num(stats.total_written, 0),
-                       big_num(stats.total_read, 0),
-                       big_num(stats.total_size, 0));
+                       comma_num(stats.total_written),
+                       comma_num(stats.total_read),
+                       comma_num(stats.total_size));
        } else if (am_server != 2) {
                const char *name;