X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flog.c;h=3cbbe17be537d2776c207f2de5a6f65327a70c36;hb=4d6d660b8306abdbc77a47e48d7f527234ce9a4f;hp=3d65cc4e20bb755d7550f87b85959990976916c9;hpb=e264ebded832bc6556f88f771e9598d998aac6ce;p=libsigrok.git

diff --git a/src/log.c b/src/log.c
index 3d65cc4e..3cbbe17b 100644
--- a/src/log.c
+++ b/src/log.c
@@ -163,7 +163,8 @@ static int sr_logv(void *cb_data, int loglevel, const char *format, va_list args
 {
 	uint64_t elapsed_us, minutes;
 	unsigned int rest_us, seconds, microseconds;
-	int ret;
+	char *raw_output, *output;
+	int raw_len, raw_idx, idx, ret;
 
 	/* This specific log callback doesn't need the void pointer data. */
 	(void)cb_data;
@@ -186,10 +187,25 @@ static int sr_logv(void *cb_data, int loglevel, const char *format, va_list args
 		ret = fputs("sr: ", stderr);
 	}
 
-	if (ret < 0 || g_vfprintf(stderr, format, args) < 0
-			|| putc('\n', stderr) < 0)
+	if (ret < 0 || (raw_len = g_vasprintf(&raw_output, format, args)) < 0)
 		return SR_ERR;
 
+	output = g_malloc0(raw_len + 1);
+
+	/* Copy the string without any unwanted newlines. */
+	raw_idx = idx = 0;
+	while (raw_idx < raw_len) {
+		if (raw_output[raw_idx] != '\n') {
+			output[idx] = raw_output[raw_idx];
+			idx++;
+		}
+		raw_idx++;
+	}
+
+	g_fprintf(stderr, "%s\n", output);
+	g_free(raw_output);
+	g_free(output);
+
 	return SR_OK;
 }