mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-03-10 10:27:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

In log_formatted(), add the newline to the format string so

Browse Source 
that we can call rwrite() instead of rprintf().
This commit is contained in:
Wayne Davison
2005-03-31 01:09:18 +00:00
parent 126e7affb7
commit d9c0051fae
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
log.c
View File

@@ -363,6 +363,12 @@ static void log_formatted(enum logcode code, char *format, char *op,
* copy in the terminating null of the inserted strings, but
* rather keep going until we reach the null of the format. */
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++;
@@ -517,7 +523,7 @@ static void log_formatted(enum logcode code, char *format, char *op,
/* Subtract the length of the escape from the string's size. */
total -= p - s;
if (len + total >= sizeof buf) {
if (len + total >= (size_t)sizeof buf) {
rprintf(FERROR,
"buffer overflow expanding %%%c -- exiting\n",
p[-1]);
@@ -537,7 +543,7 @@ static void log_formatted(enum logcode code, char *format, char *op,
p = s + len;
}
rprintf(code, "%s\n", buf);
rwrite(code, buf, total);
}
int log_format_has(const char *format, char esc)