Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved the unsafe_symlink() code to not get fooled by extra '/' chars
[rsync/rsync.git]
/
log.c
diff --git
a/log.c
b/log.c
index
d67bd2e
..
a687375
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) 1998-2001 Andrew Tridgell <tridge@samba.org>
* Copyright (C) 2000-2001 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-200
8
Wayne Davison
+ * Copyright (C) 2003-200
9
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
*
* 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 "rsync.h"
-#include "ifuncs.h"
+#include "itypes.h"
+#include "inums.h"
extern int dry_run;
extern int am_daemon;
extern int dry_run;
extern int am_daemon;
@@
-56,9
+57,10
@@
extern iconv_t ic_chck;
extern iconv_t ic_recv;
#endif
extern char curr_dir[MAXPATHLEN];
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];
extern unsigned int module_dirlen;
extern char sender_file_sum[MAX_DIGEST_LEN];
+extern const char undetermined_hostname[];
static int log_initialised;
static int logfile_was_closed;
static int log_initialised;
static int logfile_was_closed;
@@
-246,7
+248,7
@@
static void filtered_fwrite(FILE *f, const char *buf, int len, int use_isprint)
void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
{
int trailing_CR_or_NL;
void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
{
int trailing_CR_or_NL;
- FILE *f =
NULL
;
+ FILE *f =
msgs2stderr ? stderr : stdout
;
#ifdef ICONV_OPTION
iconv_t ic = is_utf8 && ic_recv != (iconv_t)-1 ? ic_recv : ic_chck;
#else
#ifdef ICONV_OPTION
iconv_t ic = is_utf8 && ic_recv != (iconv_t)-1 ? ic_recv : ic_chck;
#else
@@
-258,7
+260,7
@@
void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
if (len < 0)
exit_cleanup(RERR_MESSAGEIO);
if (len < 0)
exit_cleanup(RERR_MESSAGEIO);
- if (msgs2stderr
> 0
&& code != FLOG)
+ if (msgs2stderr && code != FLOG)
goto output_msg;
if (am_server && msg_fd_out >= 0) {
goto output_msg;
if (am_server && msg_fd_out >= 0) {
@@
-314,7
+316,7
@@
void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
/* TODO: can we send the error to the user somehow? */
return;
}
/* TODO: can we send the error to the user somehow? */
return;
}
-
msgs2stderr = -1
;
+
f = stderr
;
}
output_msg:
}
output_msg:
@@
-328,7
+330,6
@@
output_msg:
break;
case FINFO:
case FCLIENT:
break;
case FINFO:
case FCLIENT:
- f = msgs2stderr ? stderr : stdout;
break;
default:
exit_cleanup(RERR_MESSAGEIO);
break;
default:
exit_cleanup(RERR_MESSAGEIO);
@@
-453,7
+454,7
@@
void rsyserr(enum logcode code, int errcode, const char *format, ...)
void rflush(enum logcode code)
{
void rflush(enum logcode code)
{
- FILE *f
= NULL
;
+ FILE *f;
if (am_daemon || code == FLOG)
return;
if (am_daemon || code == FLOG)
return;
@@
-492,21
+493,36
@@
static void log_formatted(enum logcode code, const char *format, const char *op,
buf[total] = '\0';
for (p = buf; (p = strchr(p, '%')) != NULL; ) {
buf[total] = '\0';
for (p = buf; (p = strchr(p, '%')) != NULL; ) {
+ int humanize = 0;
s = p++;
c = fmt + 1;
s = p++;
c = fmt + 1;
+ while (*p == '\'') {
+ humanize++;
+ p++;
+ }
if (*p == '-')
*c++ = *p++;
while (isDigit(p) && c - fmt < (int)(sizeof fmt) - 8)
*c++ = *p++;
if (*p == '-')
*c++ = *p++;
while (isDigit(p) && c - fmt < (int)(sizeof fmt) - 8)
*c++ = *p++;
+ while (*p == '\'') {
+ humanize++;
+ p++;
+ }
if (!*p)
break;
*c = '\0';
n = NULL;
if (!*p)
break;
*c = '\0';
n = NULL;
+ /* Note for %h and %a: it doesn't matter what fd we pass to
+ * client_{name,addr} because rsync_module will already have
+ * forced the answer to be cached (assuming, of course, for %h
+ * that lp_reverse_lookup(module_id) is true). */
switch (*p) {
case 'h':
switch (*p) {
case 'h':
- if (am_daemon)
- n = client_name(0);
+ if (am_daemon) {
+ n = lp_reverse_lookup(module_id)
+ ? client_name(0) : undetermined_hostname;
+ }
break;
case 'a':
if (am_daemon)
break;
case 'a':
if (am_daemon)
@@
-515,7
+531,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,
case 'l':
strlcat(fmt, "s", sizeof fmt);
snprintf(buf2, sizeof buf2, fmt,
-
big_num(F_LENGTH(file), 0
));
+
do_big_num(F_LENGTH(file), humanize, NULL
));
n = buf2;
break;
case 'U':
n = buf2;
break;
case 'U':
@@
-618,7
+634,7
@@
static void log_formatted(enum logcode code, const char *format, const char *op,
n = timestring(time(NULL));
break;
case 'P':
n = timestring(time(NULL));
break;
case 'P':
- n =
module_dir
;
+ n =
full_module_path
;
break;
case 'u':
n = auth_user;
break;
case 'u':
n = auth_user;
@@
-632,7
+648,8
@@
static void log_formatted(enum logcode code, const char *format, const char *op,
initial_stats->total_read;
}
strlcat(fmt, "s", sizeof fmt);
initial_stats->total_read;
}
strlcat(fmt, "s", sizeof fmt);
- snprintf(buf2, sizeof buf2, fmt, big_num(b, 0));
+ snprintf(buf2, sizeof buf2, fmt,
+ do_big_num(b, humanize, NULL));
n = buf2;
break;
case 'c':
n = buf2;
break;
case 'c':
@@
-644,7
+661,8
@@
static void log_formatted(enum logcode code, const char *format, const char *op,
initial_stats->total_read;
}
strlcat(fmt, "s", sizeof fmt);
initial_stats->total_read;
}
strlcat(fmt, "s", sizeof fmt);
- snprintf(buf2, sizeof buf2, fmt, big_num(b, 0));
+ snprintf(buf2, sizeof buf2, fmt,
+ do_big_num(b, humanize, NULL));
n = buf2;
break;
case 'C':
n = buf2;
break;
case 'C':
@@
-855,9
+873,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",
{
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;
} else if (am_server != 2) {
const char *name;