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
Document the new --only-write-batch=FILE option.
[rsync/rsync.git]
/
log.c
diff --git
a/log.c
b/log.c
index
c8a433d
..
5192543
100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-240,7
+240,7
@@
void rwrite(enum logcode code, char *buf, int len)
if (buf[len-1] == '\r' || buf[len-1] == '\n')
fflush(f);
}
if (buf[len-1] == '\r' || buf[len-1] == '\n')
fflush(f);
}
-
+
/* This is the rsync debugging function. Call it with FINFO, FERROR or
* FLOG. */
/* This is the rsync debugging function. Call it with FINFO, FERROR or
* FLOG. */
@@
-320,7
+320,7
@@
void rsyserr(enum logcode code, int errcode, const char *format, ...)
void rflush(enum logcode code)
{
FILE *f = NULL;
void rflush(enum logcode code)
{
FILE *f = NULL;
-
+
if (am_daemon) {
return;
}
if (am_daemon) {
return;
}
@@
-360,10
+360,16
@@
static void log_formatted(enum logcode code, char *format, char *op,
*fmt = '%';
/* We expand % codes one by one in place in buf. We don't
*fmt = '%';
/* We expand % codes one by one in place in buf. We don't
- * copy in the terminating nul of the inserted strings, but
- * rather keep going until we reach the nul of the format. */
+ * copy in the terminating nul
l
of the inserted strings, but
+ * rather keep going until we reach the nul
l
of the format. */
total = strlcpy(buf, format, sizeof buf);
total = strlcpy(buf, format, sizeof buf);
-
+ if (total > MAXPATHLEN) {
+ rprintf(FERROR, "log-format string is WAY too long!\n");
+ exit_cleanup(RERR_MESSAGEIO);
+ }
+ buf[total++] = '\n';
+ buf[total] = '\0';
+
for (p = buf; (p = strchr(p, '%')) != NULL; ) {
s = p++;
n = fmt + 1;
for (p = buf; (p = strchr(p, '%')) != NULL; ) {
s = p++;
n = fmt + 1;
@@
-376,7
+382,7
@@
static void log_formatted(enum logcode code, char *format, char *op,
*n = '\0';
n = NULL;
*n = '\0';
n = NULL;
- switch (*p
++
) {
+ switch (*p) {
case 'h': if (am_daemon) n = client_name(0); break;
case 'a': if (am_daemon) n = client_addr(0); break;
case 'l':
case 'h': if (am_daemon) n = client_name(0); break;
case 'a': if (am_daemon) n = client_addr(0); break;
case 'l':
@@
-386,9
+392,9
@@
static void log_formatted(enum logcode code, char *format, char *op,
n = buf2;
break;
case 'p':
n = buf2;
break;
case 'p':
- strlcat(fmt, "d", sizeof fmt);
+ strlcat(fmt, "
l
d", sizeof fmt);
snprintf(buf2, sizeof buf2, fmt,
snprintf(buf2, sizeof buf2, fmt,
- (
int
)getpid());
+ (
long
)getpid());
n = buf2;
break;
case 'o': n = op; break;
n = buf2;
break;
case 'o': n = op; break;
@@
-418,22
+424,26
@@
static void log_formatted(enum logcode code, char *format, char *op,
break;
case 'L':
if (hlink && *hlink) {
break;
case 'L':
if (hlink && *hlink) {
- snprintf(buf2, sizeof buf2, " => %s",
- safe_fname(hlink));
- n = buf2;
+ n = safe_fname(hlink);
+ strcpy(buf2, " => ");
} else if (S_ISLNK(file->mode) && file->u.link) {
} else if (S_ISLNK(file->mode) && file->u.link) {
- snprintf(buf2, sizeof buf2, " -> %s",
- safe_fname(file->u.link));
- n = buf2;
- } else
+ n = safe_fname(file->u.link);
+ strcpy(buf2, " -> ");
+ } else {
n = "";
n = "";
+ if (!fmt[1])
+ break;
+ strcpy(buf2, " ");
+ }
+ strlcat(fmt, "s", sizeof fmt);
+ snprintf(buf2 + 4, sizeof buf2 - 4, fmt, n);
+ n = buf2;
break;
case 'm': n = lp_name(module_id); break;
case 't': n = timestring(time(NULL)); break;
case 'P': n = lp_path(module_id); break;
case 'u': n = auth_user; break;
case 'b':
break;
case 'm': n = lp_name(module_id); break;
case 't': n = timestring(time(NULL)); break;
case 'P': n = lp_path(module_id); break;
case 'u': n = auth_user; break;
case 'b':
- strlcat(fmt, ".0f", sizeof fmt);
if (am_sender) {
b = stats.total_written -
initial_stats->total_written;
if (am_sender) {
b = stats.total_written -
initial_stats->total_written;
@@
-441,11
+451,11
@@
static void log_formatted(enum logcode code, char *format, char *op,
b = stats.total_read -
initial_stats->total_read;
}
b = stats.total_read -
initial_stats->total_read;
}
+ strlcat(fmt, ".0f", sizeof fmt);
snprintf(buf2, sizeof buf2, fmt, (double)b);
n = buf2;
break;
case 'c':
snprintf(buf2, sizeof buf2, fmt, (double)b);
n = buf2;
break;
case 'c':
- strlcat(fmt, ".0f", sizeof fmt);
if (!am_sender) {
b = stats.total_written -
initial_stats->total_written;
if (!am_sender) {
b = stats.total_written -
initial_stats->total_written;
@@
-453,6
+463,7
@@
static void log_formatted(enum logcode code, char *format, char *op,
b = stats.total_read -
initial_stats->total_read;
}
b = stats.total_read -
initial_stats->total_read;
}
+ strlcat(fmt, ".0f", sizeof fmt);
snprintf(buf2, sizeof buf2, fmt, (double)b);
n = buf2;
break;
snprintf(buf2, sizeof buf2, fmt, (double)b);
n = buf2;
break;
@@
-510,18
+521,18
@@
static void log_formatted(enum logcode code, char *format, char *op,
len = strlen(n);
/* Subtract the length of the escape from the string's size. */
len = strlen(n);
/* Subtract the length of the escape from the string's size. */
- total -= p - s;
+ total -= p - s
+ 1
;
- if (len + total >= sizeof buf) {
+ if (len + total >=
(size_t)
sizeof buf) {
rprintf(FERROR,
"buffer overflow expanding %%%c -- exiting\n",
rprintf(FERROR,
"buffer overflow expanding %%%c -- exiting\n",
- p[
-1
]);
+ p[
0
]);
exit_cleanup(RERR_MESSAGEIO);
}
/* Shuffle the rest of the string along to make space for n */
exit_cleanup(RERR_MESSAGEIO);
}
/* Shuffle the rest of the string along to make space for n */
- if (len != (size_t)(p - s))
- memmove(s + len, p, total - (s - buf) + 1);
+ if (len != (size_t)(p - s
+ 1
))
+ memmove(s + len, p
+ 1
, total - (s - buf) + 1);
total += len;
/* Insert the contents of string "n", but NOT its null. */
total += len;
/* Insert the contents of string "n", but NOT its null. */
@@
-532,9
+543,11
@@
static void log_formatted(enum logcode code, char *format, char *op,
p = s + len;
}
p = s + len;
}
- r
printf(code, "%s\n", buf
);
+ r
write(code, buf, total
);
}
}
+/* Return 1 if the format escape is in the log-format string (e.g. look for
+ * the 'b' in the "%9b" format escape). */
int log_format_has(const char *format, char esc)
{
const char *p;
int log_format_has(const char *format, char esc)
{
const char *p;