Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
624d6be
)
Enabled width-sizing for %L.
author
Wayne Davison
<wayned@samba.org>
Thu, 31 Mar 2005 00:50:58 +0000
(
00:50
+0000)
committer
Wayne Davison
<wayned@samba.org>
Thu, 31 Mar 2005 00:50:58 +0000
(
00:50
+0000)
log.c
patch
|
blob
|
blame
|
history
diff --git
a/log.c
b/log.c
index
c8a433d
..
80aed1d
100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-360,8
+360,8
@@
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);
for (p = buf; (p = strchr(p, '%')) != NULL; ) {
total = strlcpy(buf, format, sizeof buf);
for (p = buf; (p = strchr(p, '%')) != NULL; ) {
@@
-386,9
+386,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,15
+418,20
@@
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;
break;
case 'm': n = lp_name(module_id); break;
case 't': n = timestring(time(NULL)); break;