int len;
FILE *f=NULL;
extern int am_daemon;
+ extern int quiet;
/* recursion can happen with certain fatal conditions */
+ if (quiet != 0 && fd == FINFO) return;
+
va_start(ap, format);
- len = vslprintf(buf, sizeof(buf)-1, format, ap);
+ len = vslprintf(buf, sizeof(buf), format, ap);
va_end(ap);
- if (len < 0) exit_cleanup(1);
+ if (len < 0) exit_cleanup(RERR_MESSAGEIO);
- if (len > sizeof(buf)-1) exit_cleanup(1);
+ if (len > sizeof(buf)-1) exit_cleanup(RERR_MESSAGEIO);
buf[len] = 0;
f = stdout;
}
- if (!f) exit_cleanup(1);
+ if (!f) exit_cleanup(RERR_MESSAGEIO);
- if (fwrite(buf, len, 1, f) != 1) exit_cleanup(1);
+ if (fwrite(buf, len, 1, f) != 1) exit_cleanup(RERR_MESSAGEIO);
if (buf[len-1] == '\r' || buf[len-1] == '\n') fflush(f);
}
f = stdout;
}
- if (!f) exit_cleanup(1);
+ if (!f) exit_cleanup(RERR_MESSAGEIO);
fflush(f);
}
/* a generic logging routine for send/recv, with parameter
substitiution */
-static void log_formatted(char *op, struct file_struct *file,
+static void log_formatted(int fd,
+ char *format, char *op, struct file_struct *file,
struct stats *initial_stats)
{
extern int module_id;
extern char *auth_user;
char buf[1024];
+ char buf2[1024];
char *p, *s, *n;
- char buf2[100];
int l;
extern struct stats stats;
extern int am_sender;
+ extern int am_daemon;
int64 b;
- strlcpy(buf, lp_log_format(module_id), sizeof(buf)-1);
+ strlcpy(buf, format, sizeof(buf));
for (s=&buf[0];
s && (p=strchr(s,'%')); ) {
s = p + 1;
switch (p[1]) {
- case 'h': n = client_name(0); break;
- case 'a': 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':
- slprintf(buf2,sizeof(buf2)-1,"%.0f",
+ slprintf(buf2,sizeof(buf2),"%.0f",
(double)file->length);
n = buf2;
break;
case 'p':
- slprintf(buf2,sizeof(buf2)-1,"%d",
+ slprintf(buf2,sizeof(buf2),"%d",
(int)getpid());
n = buf2;
break;
case 'o': n = op; break;
- case 'f': n = f_name(file); break;
+ case 'f':
+ slprintf(buf2, sizeof(buf2), "%s/%s",
+ file->basedir?file->basedir:"",
+ f_name(file));
+ clean_fname(buf2);
+ n = buf2;
+ if (*n == '/') n++;
+ 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':
b = stats.total_read -
initial_stats->total_read;
}
- slprintf(buf2,sizeof(buf2)-1,"%.0f", (double)b);
+ slprintf(buf2,sizeof(buf2),"%.0f", (double)b);
n = buf2;
break;
case 'c':
b = stats.total_read -
initial_stats->total_read;
}
- slprintf(buf2,sizeof(buf2)-1,"%.0f", (double)b);
+ slprintf(buf2,sizeof(buf2),"%.0f", (double)b);
n = buf2;
break;
}
if ((l-1) + ((int)(s - &buf[0])) > sizeof(buf)) {
rprintf(FERROR,"buffer overflow expanding %%%c - exiting\n",
p[0]);
- exit_cleanup(1);
+ exit_cleanup(RERR_MESSAGEIO);
}
if (l != 2) {
s = p+l;
}
- rprintf(FLOG,"%s\n", buf);
+ rprintf(fd,"%s\n", buf);
}
/* log the outgoing transfer of a file */
void log_send(struct file_struct *file, struct stats *initial_stats)
{
extern int module_id;
+ extern int am_server;
+ extern char *log_format;
+
if (lp_transfer_logging(module_id)) {
- log_formatted("send", file, initial_stats);
+ log_formatted(FLOG, lp_log_format(module_id), "send", file, initial_stats);
+ } else if (log_format && !am_server) {
+ log_formatted(FINFO, log_format, "send", file, initial_stats);
}
}
void log_recv(struct file_struct *file, struct stats *initial_stats)
{
extern int module_id;
+ extern int am_server;
+ extern char *log_format;
+
if (lp_transfer_logging(module_id)) {
- log_formatted("recv", file, initial_stats);
+ log_formatted(FLOG, lp_log_format(module_id), "recv", file, initial_stats);
+ } else if (log_format && !am_server) {
+ log_formatted(FINFO, log_format, "recv", file, initial_stats);
}
}
/* called when the transfer is interrupted for some reason */
-void log_exit(int code)
+void log_exit(int code, const char *file, int line)
{
if (code == 0) {
extern struct stats stats;
(double)stats.total_read,
(double)stats.total_size);
} else {
- rprintf(FLOG,"transfer interrupted\n");
+ rprintf(FLOG,"transfer interrupted (code %d) at %s(%d)\n",
+ code, file, line);
}
}
/* log the incoming transfer of a file for interactive use, this
- will be called at the end where the client was run */
-void log_transfer(struct file_struct *file, char *fname)
+ will be called at the end where the client was run
+
+ it i called when a file starts to be transferred
+*/
+void log_transfer(struct file_struct *file, const char *fname)
{
extern int verbose;