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
preparing for release of 2.2.0
[rsync/rsync.git]
/
log.c
diff --git
a/log.c
b/log.c
index
6543462
..
18e1da0
100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-93,9
+93,9
@@
void log_open(void)
len = vslprintf(buf, sizeof(buf)-1, format, ap);
va_end(ap);
len = vslprintf(buf, sizeof(buf)-1, 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;
buf[len] = 0;
@@
-134,9
+134,9
@@
void log_open(void)
f = stdout;
}
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);
}
if (buf[len-1] == '\r' || buf[len-1] == '\n') fflush(f);
}
@@
-166,7
+166,7
@@
void rflush(int fd)
f = stdout;
}
f = stdout;
}
- if (!f) exit_cleanup(
1
);
+ if (!f) exit_cleanup(
RERR_MESSAGEIO
);
fflush(f);
}
fflush(f);
}
@@
-174,7
+174,8
@@
void rflush(int fd)
/* a generic logging routine for send/recv, with parameter
substitiution */
/* 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;
struct stats *initial_stats)
{
extern int module_id;
@@
-187,7
+188,7
@@
static void log_formatted(char *op, struct file_struct *file,
extern int am_sender;
int64 b;
extern int am_sender;
int64 b;
- strlcpy(buf,
lp_log_format(module_id)
, sizeof(buf)-1);
+ strlcpy(buf,
format
, sizeof(buf)-1);
for (s=&buf[0];
s && (p=strchr(s,'%')); ) {
for (s=&buf[0];
s && (p=strchr(s,'%')); ) {
@@
-214,8
+215,10
@@
static void log_formatted(char *op, struct file_struct *file,
f_name(file));
clean_fname(buf2);
n = buf2;
f_name(file));
clean_fname(buf2);
n = buf2;
+ if (*n == '/') n++;
break;
case 'm': n = lp_name(module_id); break;
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':
case 'P': n = lp_path(module_id); break;
case 'u': n = auth_user; break;
case 'b':
@@
-249,7
+252,7
@@
static void log_formatted(char *op, struct file_struct *file,
if ((l-1) + ((int)(s - &buf[0])) > sizeof(buf)) {
rprintf(FERROR,"buffer overflow expanding %%%c - exiting\n",
p[0]);
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) {
}
if (l != 2) {
@@
-260,15
+263,20
@@
static void log_formatted(char *op, struct file_struct *file,
s = p+l;
}
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;
}
/* 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)) {
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);
}
}
}
}
@@
-276,8
+284,13
@@
void log_send(struct file_struct *file, struct stats *initial_stats)
void log_recv(struct file_struct *file, struct stats *initial_stats)
{
extern int module_id;
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)) {
if (lp_transfer_logging(module_id)) {
- log_formatted("recv", 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);
}
}
}
}
@@
-291,12
+304,15
@@
void log_exit(int code)
(double)stats.total_read,
(double)stats.total_size);
} else {
(double)stats.total_read,
(double)stats.total_size);
} else {
- rprintf(FLOG,"transfer interrupted
\n"
);
+ rprintf(FLOG,"transfer interrupted
(code %d)\n", code
);
}
}
/* log the incoming transfer of a file for interactive use, this
}
}
/* log the incoming transfer of a file for interactive use, this
- will be called at the end where the client was run */
+ 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, char *fname)
{
extern int verbose;
void log_transfer(struct file_struct *file, char *fname)
{
extern int verbose;