Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e08bfe1
)
hopefuly fix logging of "transfer interrupted" messages
author
Andrew Tridgell
<tridge@samba.org>
Fri, 30 Oct 1998 02:32:29 +0000
(
02:32
+0000)
committer
Andrew Tridgell
<tridge@samba.org>
Fri, 30 Oct 1998 02:32:29 +0000
(
02:32
+0000)
log.c
patch
|
blob
|
blame
|
history
diff --git
a/log.c
b/log.c
index
a4f06f1
..
93d7a17
100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-110,8
+110,6
@@
void log_open(void)
if (depth) return;
if (depth) return;
- depth++;
-
va_start(ap, format);
len = vslprintf(buf, sizeof(buf)-1, format, ap);
va_end(ap);
va_start(ap, format);
len = vslprintf(buf, sizeof(buf)-1, format, ap);
va_end(ap);
@@
-124,7
+122,6
@@
void log_open(void)
if (fd == FLOG) {
if (am_daemon) logit(LOG_INFO, buf);
if (fd == FLOG) {
if (am_daemon) logit(LOG_INFO, buf);
- depth--;
return;
}
return;
}
@@
-132,6
+129,8
@@
void log_open(void)
int priority = LOG_INFO;
if (fd == FERROR) priority = LOG_WARNING;
int priority = LOG_INFO;
if (fd == FERROR) priority = LOG_WARNING;
+ depth++;
+
log_open();
if (!io_multiplex_write(fd, buf, strlen(buf))) {
logit(priority, buf);
log_open();
if (!io_multiplex_write(fd, buf, strlen(buf))) {
logit(priority, buf);
@@
-158,8
+157,6
@@
void log_open(void)
if (fwrite(buf, len, 1, f) != 1) exit_cleanup(1);
if (buf[len-1] == '\r' || buf[len-1] == '\n') fflush(f);
if (fwrite(buf, len, 1, f) != 1) exit_cleanup(1);
if (buf[len-1] == '\r' || buf[len-1] == '\n') fflush(f);
-
- depth--;
}
void rflush(int fd)
}
void rflush(int fd)