From 1fa8e69d44a3e60593679780b8294bd3d49ad92c Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Mon, 17 Jul 2017 16:19:13 -0600
Subject: [PATCH] Correction to srun output label work from commit 574474028e
---
src/common/write_labelled_message.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/common/write_labelled_message.c b/src/common/write_labelled_message.c
index f6c69f85280..fd6868f737b 100644
--- a/src/common/write_labelled_message.c
+++ b/src/common/write_labelled_message.c
@@ -86,7 +86,8 @@ extern int write_labelled_message(int fd, void *buf, int len, int taskid,
start = buf + written;
end = memchr(start, '\n', remaining);
if (end == NULL) { /* no newline found */
- suffix = "\n";
+ if (label)
+ suffix = "\n";
rc = _write_line(fd, prefix, suffix, start, remaining);
if (rc <= 0) {
goto done;
@@ -150,7 +151,7 @@ static int _write_line(int fd, char *prefix, char *suffix, void *buf, int len)
memcpy(tmp, prefix, pre);
memcpy(tmp + pre, buf, len);
if (suffix)
- memcpy(tmp + pre + len, suffix, pre);
+ memcpy(tmp + pre + len, suffix, post);
ptr = tmp;
left = pre + len + post;
} else {
--
GitLab