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
Got rid of calls to the (soon to vanish) safe_fname() function.
[rsync/rsync.git]
/
log.c
diff --git
a/log.c
b/log.c
index
c93989b
..
41d847f
100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-267,7
+267,7
@@
void rwrite(enum logcode code, char *buf, int len)
void rprintf(enum logcode code, const char *format, ...)
{
va_list ap;
void rprintf(enum logcode code, const char *format, ...)
{
va_list ap;
- char buf[
MAXPATHLEN+512
];
+ char buf[
BIGPATHBUFLEN
];
size_t len;
va_start(ap, format);
size_t len;
va_start(ap, format);
@@
-278,7
+278,7
@@
void rprintf(enum logcode code, const char *format, ...)
* truncate the resulting string. (Note that configure ensures
* that we have a vsnprintf() that doesn't ever return -1.) */
if (len > sizeof buf - 1) {
* truncate the resulting string. (Note that configure ensures
* that we have a vsnprintf() that doesn't ever return -1.) */
if (len > sizeof buf - 1) {
- const char ellipsis[] = "[...]";
+
static
const char ellipsis[] = "[...]";
/* Reset length, and zero-terminate the end of our buffer */
len = sizeof buf - 1;
/* Reset length, and zero-terminate the end of our buffer */
len = sizeof buf - 1;
@@
-294,7
+294,7
@@
void rprintf(enum logcode code, const char *format, ...)
* If the input format string has a trailing newline,
* we copy it into that extra null; if it doesn't, well,
* all we lose is one byte. */
* If the input format string has a trailing newline,
* we copy it into that extra null; if it doesn't, well,
* all we lose is one byte. */
-
strn
cpy(buf+len-sizeof ellipsis, ellipsis, sizeof ellipsis);
+
mem
cpy(buf+len-sizeof ellipsis, ellipsis, sizeof ellipsis);
if (format[strlen(format)-1] == '\n') {
buf[len-1] = '\n';
}
if (format[strlen(format)-1] == '\n') {
buf[len-1] = '\n';
}
@@
-315,7
+315,7
@@
void rprintf(enum logcode code, const char *format, ...)
void rsyserr(enum logcode code, int errcode, const char *format, ...)
{
va_list ap;
void rsyserr(enum logcode code, int errcode, const char *format, ...)
{
va_list ap;
- char buf[
MAXPATHLEN+512
];
+ char buf[
BIGPATHBUFLEN
];
size_t len;
strcpy(buf, RSYNC_NAME ": ");
size_t len;
strcpy(buf, RSYNC_NAME ": ");
@@
-403,8
+403,14
@@
static void log_formatted(enum logcode code, char *format, char *op,
n = NULL;
switch (*p) {
n = NULL;
switch (*p) {
- case 'h': if (am_daemon) n = client_name(0); break;
- case 'a': if (am_daemon) n = client_addr(0); break;
+ case 'h':
+ if (am_daemon)
+ n = client_name(0);
+ break;
+ case 'a':
+ if (am_daemon)
+ n = client_addr(0);
+ break;
case 'l':
strlcat(fmt, ".0f", sizeof fmt);
snprintf(buf2, sizeof buf2, fmt,
case 'l':
strlcat(fmt, ".0f", sizeof fmt);
snprintf(buf2, sizeof buf2, fmt,
@@
-417,37
+423,35
@@
static void log_formatted(enum logcode code, char *format, char *op,
(long)getpid());
n = buf2;
break;
(long)getpid());
n = buf2;
break;
- case 'o': n = op; break;
+ case 'o':
+ n = op;
+ break;
case 'f':
case 'f':
- n =
safe_fname(f_name(file)
);
+ n =
f_name(file
);
if (am_sender && file->dir.root) {
pathjoin(buf2, sizeof buf2,
file->dir.root, n);
if (am_sender && file->dir.root) {
pathjoin(buf2, sizeof buf2,
file->dir.root, n);
- /* The buffer from safe_fname() has more
- * room than MAXPATHLEN, so this is safe. */
+ clean_fname(buf2, 0);
if (fmt[1])
if (fmt[1])
- str
cpy(n, buf2
);
+ str
lcpy(n, buf2, MAXPATHLEN
);
else
n = buf2;
else
n = buf2;
- }
- clean_fname(n, 0);
+ }
else
+
clean_fname(n, 0);
if (*n == '/')
n++;
break;
case 'n':
if (*n == '/')
n++;
break;
case 'n':
- n = safe_fname(f_name(file));
- if (S_ISDIR(file->mode)) {
- /* The buffer from safe_fname() has more
- * room than MAXPATHLEN, so this is safe. */
- strcat(n, "/");
- }
+ n = f_name(file);
+ if (S_ISDIR(file->mode))
+ strlcat(n, "/", MAXPATHLEN);
break;
case 'L':
if (hlink && *hlink) {
break;
case 'L':
if (hlink && *hlink) {
- n =
safe_fname(hlink)
;
+ n =
hlink
;
strcpy(buf2, " => ");
} else if (S_ISLNK(file->mode) && file->u.link) {
strcpy(buf2, " => ");
} else if (S_ISLNK(file->mode) && file->u.link) {
- n =
safe_fname(file->u.link)
;
+ n =
file->u.link
;
strcpy(buf2, " -> ");
} else {
n = "";
strcpy(buf2, " -> ");
} else {
n = "";
@@
-459,10
+463,18
@@
static void log_formatted(enum logcode code, char *format, char *op,
snprintf(buf2 + 4, sizeof buf2 - 4, fmt, n);
n = buf2;
break;
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 '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':
if (am_sender) {
b = stats.total_written -
case 'b':
if (am_sender) {
b = stats.total_written -