-/*
- Copyright (C) Andrew Tridgell 1998
+/* -*- c-file-style: "linux"; -*-
+
+ Copyright (C) 1998-2000 by Andrew Tridgell
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
#include "rsync.h"
+static char *logfname;
static FILE *logfile;
static int log_error_fd = -1;
static void logit(int priority, char *buf)
{
- if (logfile) {
+ if (logfname) {
+ if (!logfile)
+ log_open();
fprintf(logfile,"%s [%d] %s",
timestring(time(NULL)), (int)getpid(), buf);
fflush(logfile);
}
}
-void log_open(void)
+void log_init(void)
{
static int initialised;
int options = LOG_PID;
time_t t;
- char *logf;
if (initialised) return;
initialised = 1;
localtime(&t);
/* optionally use a log file instead of syslog */
- logf = lp_log_file();
- if (logf && *logf) {
- extern int orig_umask;
- int old_umask = umask(022 | orig_umask);
- logfile = fopen(logf, "a");
- umask(old_umask);
- return;
+ logfname = lp_log_file();
+ if (logfname) {
+ if (*logfname) {
+ log_open();
+ return;
+ }
+ logfname = NULL;
}
#ifdef LOG_NDELAY
#endif
}
+void log_open()
+{
+ if (logfname && !logfile) {
+ extern int orig_umask;
+ int old_umask = umask(022 | orig_umask);
+ logfile = fopen(logfname, "a");
+ umask(old_umask);
+ }
+}
+
+void log_close()
+{
+ if (logfile) {
+ fclose(logfile);
+ logfile = NULL;
+ }
+}
+
/* setup the error file descriptor - used when we are a server
that is receiving files */
void set_error_fd(int fd)
/* this is the underlying (unformatted) rsync debugging function. Call
it with FINFO, FERROR or FLOG */
-void rwrite(int fd, char *buf, int len)
+void rwrite(enum logcode code, char *buf, int len)
{
FILE *f=NULL;
extern int am_daemon;
+ extern int am_server;
extern int quiet;
/* recursion can happen with certain fatal conditions */
- if (quiet != 0 && fd == FINFO) return;
+ if (quiet && code == FINFO) return;
if (len < 0) exit_cleanup(RERR_MESSAGEIO);
buf[len] = 0;
- if (fd == FLOG) {
+ if (code == FLOG) {
if (am_daemon) logit(LOG_INFO, buf);
return;
}
+ /* first try to pass it off the our sibling */
+ if (am_server && io_error_write(log_error_fd, code, buf, len)) {
+ return;
+ }
+
+ /* then try to pass it to the other end */
+ if (am_server && io_multiplex_write(code, buf, len)) {
+ return;
+ }
+
if (am_daemon) {
static int depth;
int priority = LOG_INFO;
- if (fd == FERROR) priority = LOG_WARNING;
+ if (code == FERROR) priority = LOG_WARNING;
if (depth) return;
depth++;
- log_open();
-
- if (!io_error_write(log_error_fd, buf, strlen(buf)) &&
- !io_multiplex_write(fd, buf, strlen(buf))) {
- logit(priority, buf);
- }
+ log_init();
+ logit(priority, buf);
depth--;
return;
}
- if (fd == FERROR) {
+ if (code == FERROR) {
f = stderr;
}
- if (fd == FINFO) {
- extern int am_server;
+ if (code == FINFO) {
if (am_server)
f = stderr;
else
}
-/* this is the rsync debugging function. Call it with FINFO, FERROR or FLOG */
- void rprintf(int fd, const char *format, ...)
+/* This is the rsync debugging function. Call it with FINFO, FERROR or
+ * FLOG. */
+void rprintf(enum logcode code, const char *format, ...)
{
va_list ap;
char buf[1024];
if (len > sizeof(buf)-1) exit_cleanup(RERR_MESSAGEIO);
- rwrite(fd, buf, len);
+ rwrite(code, buf, len);
}
-void rflush(int fd)
+
+/* This is like rprintf, but it also tries to print some
+ * representation of the error code. Normally errcode = errno.
+ *
+ * Unlike rprintf, this always adds a newline and there should not be
+ * one in the format string.
+ *
+ * Note that since strerror might involve dynamically loading a
+ * message catalog we need to call it once before chroot-ing. */
+void rsyserr(enum logcode code, int errcode, const char *format, ...)
+{
+ va_list ap;
+ char buf[1024];
+ int len, sys_len;
+ char *sysmsg;
+
+ va_start(ap, format);
+ len = vslprintf(buf, sizeof(buf), format, ap);
+ va_end(ap);
+
+ if (len > sizeof(buf)-1) exit_cleanup(RERR_MESSAGEIO);
+
+ sysmsg = strerror(errcode);
+ sys_len = strlen(sysmsg);
+ if (len + 3 + sys_len > sizeof(buf) - 1)
+ exit_cleanup(RERR_MESSAGEIO);
+
+ strcpy(buf + len, ": ");
+ len += 2;
+ strcpy(buf + len, sysmsg);
+ len += sys_len;
+ strcpy(buf + len, "\n");
+ len++;
+
+ rwrite(code, buf, len);
+}
+
+
+
+void rflush(enum logcode code)
{
FILE *f = NULL;
extern int am_daemon;
return;
}
- if (fd == FLOG) {
+ if (code == FLOG) {
return;
}
- if (fd == FERROR) {
+ if (code == FERROR) {
f = stderr;
}
- if (fd == FINFO) {
+ if (code == FINFO) {
extern int am_server;
if (am_server)
f = stderr;
/* a generic logging routine for send/recv, with parameter
substitiution */
-static void log_formatted(int fd,
+static void log_formatted(enum logcode code,
char *format, char *op, struct file_struct *file,
struct stats *initial_stats)
{
s = p+l;
}
- rprintf(fd,"%s\n", buf);
+ rprintf(code,"%s\n", buf);
}
/* log the outgoing transfer of a file */