X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8d94d27af04b3eddb0f1d62ddd7424a31312620b..b635bc92d16f538b2ea949580f55c86532d84843:/log.c diff --git a/log.c b/log.c index 77ce6d18..135a57a1 100644 --- a/log.c +++ b/log.c @@ -39,13 +39,13 @@ extern int local_server; extern int quiet; extern int module_id; extern int msg_fd_out; -extern int orig_umask; extern int allow_8bit_chars; extern int protocol_version; extern int preserve_times; extern int log_format_has_i; extern int log_format_has_o_or_i; extern int daemon_log_format_has_o_or_i; +extern mode_t orig_umask; extern char *auth_user; extern char *log_format; #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H @@ -144,7 +144,7 @@ static void syslog_init() static void logfile_open(void) { - int old_umask = umask(022 | orig_umask); + mode_t old_umask = umask(022 | orig_umask); logfile = fopen(logfname, "a"); umask(old_umask); if (!logfile) { @@ -769,11 +769,11 @@ void log_exit(int code, const char *file, int line) /* VANISHED is not an error, only a warning */ if (code == RERR_VANISHED) { - rprintf(FINFO, "rsync warning: %s (code %d) at %s(%d) [%s]\n", - name, code, file, line, who_am_i()); + rprintf(FINFO, "rsync warning: %s (code %d) at %s(%d) [%s=%s]\n", + name, code, file, line, who_am_i(), RSYNC_VERSION); } else { - rprintf(FERROR, "rsync error: %s (code %d) at %s(%d) [%s]\n", - name, code, file, line, who_am_i()); + rprintf(FERROR, "rsync error: %s (code %d) at %s(%d) [%s=%s]\n", + name, code, file, line, who_am_i(), RSYNC_VERSION); } } }