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
don't write more than PIPE_BUF bytes in any one write() in io.c
[rsync/rsync.git]
/
log.c
diff --git
a/log.c
b/log.c
index
62572da
..
6239409
100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-87,15
+87,18
@@
void log_open(void)
int len;
FILE *f=NULL;
extern int am_daemon;
int len;
FILE *f=NULL;
extern int am_daemon;
+ extern int quiet;
/* recursion can happen with certain fatal conditions */
/* recursion can happen with certain fatal conditions */
+ if (quiet != 0 && fd == FINFO) return;
+
va_start(ap, format);
va_start(ap, format);
- len = vslprintf(buf, sizeof(buf)
-1
, format, ap);
+ len = vslprintf(buf, sizeof(buf), format, ap);
va_end(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
+137,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
+169,7
@@
void rflush(int fd)
f = stdout;
}
f = stdout;
}
- if (!f) exit_cleanup(
1
);
+ if (!f) exit_cleanup(
RERR_MESSAGEIO
);
fflush(f);
}
fflush(f);
}
@@
-186,9
+189,10
@@
static void log_formatted(int fd,
int l;
extern struct stats stats;
extern int am_sender;
int l;
extern struct stats stats;
extern int am_sender;
+ extern int am_daemon;
int64 b;
int64 b;
- strlcpy(buf, format, sizeof(buf)
-1
);
+ strlcpy(buf, format, sizeof(buf));
for (s=&buf[0];
s && (p=strchr(s,'%')); ) {
for (s=&buf[0];
s && (p=strchr(s,'%')); ) {
@@
-196,21
+200,21
@@
static void log_formatted(int fd,
s = p + 1;
switch (p[1]) {
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':
case 'l':
- slprintf(buf2,sizeof(buf2)
-1
,"%.0f",
+ slprintf(buf2,sizeof(buf2),"%.0f",
(double)file->length);
n = buf2;
break;
case 'p':
(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':
(int)getpid());
n = buf2;
break;
case 'o': n = op; break;
case 'f':
- slprintf(buf2, sizeof(buf2)
-1
, "%s/%s",
+ slprintf(buf2, sizeof(buf2), "%s/%s",
file->basedir?file->basedir:"",
f_name(file));
clean_fname(buf2);
file->basedir?file->basedir:"",
f_name(file));
clean_fname(buf2);
@@
-229,7
+233,7
@@
static void log_formatted(int fd,
b = stats.total_read -
initial_stats->total_read;
}
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':
n = buf2;
break;
case 'c':
@@
-240,7
+244,7
@@
static void log_formatted(int fd,
b = stats.total_read -
initial_stats->total_read;
}
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;
}
n = buf2;
break;
}
@@
-252,7
+256,7
@@
static void log_formatted(int fd,
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) {
@@
-288,14
+292,14
@@
void log_recv(struct file_struct *file, struct stats *initial_stats)
extern char *log_format;
if (lp_transfer_logging(module_id)) {
extern char *log_format;
if (lp_transfer_logging(module_id)) {
- log_formatted(FLOG, lp_log_format(module_id), "
send
", file, initial_stats);
+ log_formatted(FLOG, lp_log_format(module_id), "
recv
", file, initial_stats);
} else if (log_format && !am_server) {
} else if (log_format && !am_server) {
- log_formatted(FINFO, log_format, "
send
", file, initial_stats);
+ log_formatted(FINFO, log_format, "
recv
", file, initial_stats);
}
}
/* called when the transfer is interrupted for some reason */
}
}
/* 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;
{
if (code == 0) {
extern struct stats stats;
@@
-304,7
+308,8
@@
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) at %s(%d)\n",
+ code, file, line);
}
}
}
}
@@
-313,7
+318,7
@@
void log_exit(int code)
it i called when a file starts to be transferred
*/
it i called when a file starts to be transferred
*/
-void log_transfer(struct file_struct *file, char *fname)
+void log_transfer(struct file_struct *file, c
onst c
har *fname)
{
extern int verbose;
{
extern int verbose;