The branch, master has been updated
via ff272503 Output who_am_i() info in all rsyserr() messages.
from 43a939e3 Improve some md files.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ff272503b0ff48c7a1260a0cff108319618d6cde
Author: Wayne Davison <wa...@opencoder.net>
Date: Sun Jun 14 15:54:42 2020 -0700
Output who_am_i() info in all rsyserr() messages.
-----------------------------------------------------------------------
Summary of changes:
io.c | 15 ++++++---------
log.c | 3 +--
2 files changed, 7 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/io.c b/io.c
index 3c5584df..6c3730c8 100644
--- a/io.c
+++ b/io.c
@@ -251,8 +251,7 @@ static size_t safe_read(int fd, char *buf, size_t len)
cnt = select(fd+1, &r_fds, NULL, &e_fds, &tv);
if (cnt <= 0) {
if (cnt < 0 && errno == EBADF) {
- rsyserr(FERROR, errno, "safe_read select failed
[%s]",
- who_am_i());
+ rsyserr(FERROR, errno, "safe_read select
failed");
exit_cleanup(RERR_FILEIO);
}
check_timeout(1, MSK_ALLOW_FLUSH);
@@ -271,8 +270,7 @@ static size_t safe_read(int fd, char *buf, size_t len)
if (n < 0) {
if (errno == EINTR)
continue;
- rsyserr(FERROR, errno, "safe_read failed to
read %ld bytes [%s]",
- (long)len, who_am_i());
+ rsyserr(FERROR, errno, "safe_read failed to
read %ld bytes", (long)len);
exit_cleanup(RERR_STREAMIO);
}
if ((got += (size_t)n) == len)
@@ -315,8 +313,8 @@ static void safe_write(int fd, const char *buf, size_t len)
if (errno != EINTR && errno != EWOULDBLOCK && errno != EAGAIN) {
write_failed:
rsyserr(FERROR, errno,
- "safe_write failed to write %ld bytes to %s
[%s]",
- (long)len, what_fd_is(fd), who_am_i());
+ "safe_write failed to write %ld bytes to %s",
+ (long)len, what_fd_is(fd));
exit_cleanup(RERR_STREAMIO);
}
} else {
@@ -337,8 +335,7 @@ static void safe_write(int fd, const char *buf, size_t len)
cnt = select(fd + 1, NULL, &w_fds, NULL, &tv);
if (cnt <= 0) {
if (cnt < 0 && errno == EBADF) {
- rsyserr(FERROR, errno, "safe_write select
failed on %s [%s]",
- what_fd_is(fd), who_am_i());
+ rsyserr(FERROR, errno, "safe_write select
failed on %s", what_fd_is(fd));
exit_cleanup(RERR_FILEIO);
}
if (io_timeout)
@@ -815,7 +812,7 @@ static char *perform_io(size_t needed, int flags)
msgs2stderr = 1;
iobuf.out_fd = -2;
iobuf.out.len = iobuf.msg.len =
iobuf.raw_flushing_ends_before = 0;
- rsyserr(FERROR_SOCKET, errno, "[%s]
write error", who_am_i());
+ rsyserr(FERROR_SOCKET, errno, "write
error");
drain_multiplex_messages();
exit_cleanup(RERR_SOCKETIO);
}
diff --git a/log.c b/log.c
index 2d8c5937..73428d31 100644
--- a/log.c
+++ b/log.c
@@ -452,8 +452,7 @@ void rsyserr(enum logcode code, int errcode, const char
*format, ...)
char buf[BIGPATHBUFLEN];
size_t len;
- strlcpy(buf, RSYNC_NAME ": ", sizeof buf);
- len = (sizeof RSYNC_NAME ": ") - 1;
+ len = snprintf(buf, sizeof buf, RSYNC_NAME ": [%s] ", who_am_i());
va_start(ap, format);
len += vsnprintf(buf + len, sizeof buf - len, format, ap);
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
