diff --git a/cache.c b/cache.c
index 1c843ba..5937254 100644
--- a/cache.c
+++ b/cache.c
@@ -270,6 +270,13 @@ static int process_slot(struct cache_slot *slot)
{
int err;
+ /*
+ * Make sure any buffered data is flushed before we redirect,
+ * do sendfile(2) or write(2)
+ */
+ if (fflush(stdout))
+ return errno;
+
err = open_slot(slot);
if (!err && slot->match) {
if (is_expired(slot)) {
diff --git a/cgit.c b/cgit.c
index 579db64..b8e64b7 100644
--- a/cgit.c
+++ b/cgit.c
@@ -682,7 +682,7 @@ static inline void authenticate_post(void)
len = MAX_AUTHENTICATION_POST_BYTES;
if ((len = read(STDIN_FILENO, buffer, len)) < 0)
die_errno("Could not read POST from stdin");
- if (write(STDOUT_FILENO, buffer, len) < 0)
+ if (fwrite(buffer, 1, len, stdout) < len)
die_errno("Could not write POST to stdout");
cgit_close_filter(ctx.cfg.auth_filter);
exit(0);
diff --git a/filter.c b/filter.c
index 22b4970..abdd4b0 100644
--- a/filter.c
+++ b/filter.c
@@ -48,6 +48,7 @@ static int open_exec_filter(struct cgit_filter *base, va_list ap)
for (i = 0; i < filter->base.argument_count; i++)
filter->argv[i + 1] = va_arg(ap, char *);
+ chk_zero(fflush(stdout), "unable to flush STDOUT");
filter->old_stdout = chk_positive(dup(STDOUT_FILENO),
"Unable to duplicate STDOUT");
chk_zero(pipe(pipe_fh), "Unable to create pipe to subprocess");
@@ -71,6 +72,7 @@ static int close_exec_filter(struct cgit_filter *base)
struct cgit_exec_filter *filter = (struct cgit_exec_filter *)base;
int i, exit_status = 0;
+ chk_zero(fflush(stdout), "unable to flush STDOUT");
chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO),
"Unable to restore STDOUT");
close(filter->old_stdout);
@@ -143,17 +145,32 @@ void cgit_init_filters(void)
#endif
#ifndef NO_LUA
-static ssize_t (*libc_write)(int fd, const void *buf, size_t count);
+static size_t (*libc_fwrite)(const void *buf, size_t size, size_t n, FILE *);
+static ssize_t (*libc_write)(int fd, const void *buf, size_t size);
static ssize_t (*filter_write)(struct cgit_filter *base, const void *buf, size_t count) = NULL;
static struct cgit_filter *current_write_filter = NULL;
void cgit_init_filters(void)
{
+ /*
+ * we need to wrap both functions since the Lua filter may
+ * have code which calls write(2) directly, bypassing fwrite(3)
+ */
+ libc_fwrite = dlsym(RTLD_NEXT, "fwrite");
+ if (!libc_fwrite)
+ die("Could not locate libc's write function");
libc_write = dlsym(RTLD_NEXT, "write");
if (!libc_write)
die("Could not locate libc's write function");
}
+size_t fwrite(const void *buf, size_t size, size_t n, FILE *f)
+{
+ if (f != stdout || !filter_write)
+ return libc_fwrite(buf, size, n, f);
+ return filter_write(current_write_filter, buf, size * n);
+}
+
ssize_t write(int fd, const void *buf, size_t count)
{
if (fd != STDOUT_FILENO || !filter_write)
@@ -305,6 +322,9 @@ static int open_lua_filter(struct cgit_filter *base, va_list ap)
struct lua_filter *filter = (struct lua_filter *)base;
int i;
+ if (fflush(stdout))
+ return 1;
+
if (init_lua_filter(filter))
return 1;
diff --git a/html.c b/html.c
index 0bac34b..ced781a 100644
--- a/html.c
+++ b/html.c
@@ -80,7 +80,7 @@ char *fmtalloc(const char *format, ...)
void html_raw(const char *data, size_t size)
{
- if (write(STDOUT_FILENO, data, size) != size)
+ if (fwrite(data, 1, size, stdout) != size)
die_errno("write error on html output");
}
diff --git a/ui-snapshot.c b/ui-snapshot.c
index d157222..b3039d9 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -39,6 +39,9 @@ static int write_archive_type(const char *format, const char *hex, const char *p
/* strvec guarantees a trailing NULL entry. */
memcpy(nargv, argv.v, sizeof(char *) * (argv.nr + 1));
+ if (fflush(stdout))
+ return errno;
+
result = write_archive(argv.nr, nargv, NULL, the_repository, NULL, 0);
strvec_clear(&argv);
free(nargv);
|
