summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2013-05-11 17:42:56 +0300
committerEli Zaretskii <eliz@gnu.org>2013-05-11 17:42:56 +0300
commit5a462bb62aefdb530b493ef3657fdccb93a3c6fe (patch)
treed2d4cc2b1eb8dbaf3a03b121936eba657960a829
parente4f28365c2c5727f300d5af7077e685605433acd (diff)
downloadmake-5a462bb62aefdb530b493ef3657fdccb93a3c6fe.tar.gz
Avoid printing stdout and stderr messages without a newline between them.
job.c (child_out): Output the newline following the message before fllush-ing the stream. Avoids displaying the following failure message, which goes to stderr, on the same line.
-rw-r--r--ChangeLog6
-rw-r--r--job.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 21e22aef..4d085763 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-11 Eli Zaretskii <eliz@gnu.org>
+
+ * job.c (child_out): Output the newline following the message
+ before fllush-ing the stream. Avoids displaying the following
+ failure message, which goes to stderr, on the same line.
+
2013-05-06 Eli Zaretskii <eliz@gnu.org>
* gnumake.h (GMK_EXPORT) [_WIN32]: Move the dllexport declaration
diff --git a/job.c b/job.c
index daf3efef..106c518f 100644
--- a/job.c
+++ b/job.c
@@ -503,8 +503,8 @@ child_out (const struct child *child, const char *msg, int out)
{
FILE *f = out ? stdout : stderr;
fputs (msg, f);
- fflush (f);
putc ('\n', f);
+ fflush (f);
}
}