run_processes_parallel: treat output of children as byte array

We do not want the output to be interrupted by a NUL byte, so we
cannot use raw fputs. Introduce strbuf_write to avoid having long
arguments in run-command.c.

Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/run-command.c b/run-command.c
index 8e3ad07ffe823f9eb29eaf2794ab0549b4afd1ea..bdda94006e2fc4a7241ab4ab4708da397faf261b 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -994,7 +994,7 @@ static void pp_cleanup(struct parallel_processes *pp)
         * When get_next_task added messages to the buffer in its last
         * iteration, the buffered output is non empty.
         */
         * When get_next_task added messages to the buffer in its last
         * iteration, the buffered output is non empty.
         */

-       fputs(pp->buffered_output.buf, stderr);
+       strbuf_write(&pp->buffered_output, stderr);

        strbuf_release(&pp->buffered_output);
 
        sigchain_pop_common();
        strbuf_release(&pp->buffered_output);
 
        sigchain_pop_common();


@@ -1079,7 +1079,7 @@ static void pp_output(struct parallel_processes *pp)
        int i = pp->output_owner;
        if (pp->children[i].state == GIT_CP_WORKING &&
            pp->children[i].err.len) {
        int i = pp->output_owner;
        if (pp->children[i].state == GIT_CP_WORKING &&
            pp->children[i].err.len) {

-               fputs(pp->children[i].err.buf, stderr);
+               strbuf_write(&pp->children[i].err, stderr);

                strbuf_reset(&pp->children[i].err);
        }
 }
                strbuf_reset(&pp->children[i].err);
        }
 }


@@ -1117,11 +1117,11 @@ static int pp_collect_finished(struct parallel_processes *pp)
                        strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
                        strbuf_reset(&pp->children[i].err);
                } else {
                        strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
                        strbuf_reset(&pp->children[i].err);
                } else {

-                       fputs(pp->children[i].err.buf, stderr);
+                       strbuf_write(&pp->children[i].err, stderr);

                        strbuf_reset(&pp->children[i].err);
 
                        /* Output all other finished child processes */
                        strbuf_reset(&pp->children[i].err);
 
                        /* Output all other finished child processes */

-                       fputs(pp->buffered_output.buf, stderr);
+                       strbuf_write(&pp->buffered_output, stderr);

                        strbuf_reset(&pp->buffered_output);
 
                        /*
                        strbuf_reset(&pp->buffered_output);
 
                        /*

diff --git a/strbuf.c b/strbuf.c
index 38686ffb65c2de953f9b224a5eecd22188081417..5f6da82e7e57481f4aba41fdcb5978593a92a10a 100644 (file)
--- a/strbuf.c
+++ b/strbuf.c
@@ -395,6 +395,12 @@ ssize_t strbuf_read_once(struct strbuf *sb, int fd, size_t hint)
        return cnt;
 }
 
        return cnt;
 }
 

+ssize_t strbuf_write(struct strbuf *sb, FILE *f)
+{
+       return sb->len ? fwrite(sb->buf, 1, sb->len, f) : 0;
+}
+
+

 #define STRBUF_MAXLINK (2*PATH_MAX)
 
 int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint)
 #define STRBUF_MAXLINK (2*PATH_MAX)
 
 int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint)

diff --git a/strbuf.h b/strbuf.h
index 2bf90e70fcf1e9bcbfcbfdf4bc8b30e1d7b61d10..d4f2aa1365d52e80d5601f8c298024bd82a95fa7 100644 (file)
--- a/strbuf.h
+++ b/strbuf.h
@@ -386,6 +386,12 @@ extern ssize_t strbuf_read_file(struct strbuf *sb, const char *path, size_t hint
  */
 extern int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint);
 
  */
 extern int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint);
 

+/**
+ * Write the whole content of the strbuf to the stream not stopping at
+ * NUL bytes.
+ */
+extern ssize_t strbuf_write(struct strbuf *sb, FILE *stream);
+

 /**
  * Read a line from a FILE *, overwriting the existing contents
  * of the strbuf. The second argument specifies the line
 /**
  * Read a line from a FILE *, overwriting the existing contents
  * of the strbuf. The second argument specifies the line