X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flog.c;h=03dd21f0124f904225057650de63a6da7ff43bab;hb=eac48b34917cf19c2b5ba52ccea85ec94bb5830f;hp=2265181ea9c16c7eb87129cae522f6914e33fd96;hpb=782b16447b25ce31d41764ae91681a6aa4f3fe0d;p=libsigrok.git

diff --git a/src/log.c b/src/log.c
index 2265181e..03dd21f0 100644
--- a/src/log.c
+++ b/src/log.c
@@ -14,12 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <glib/gprintf.h>
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
@@ -161,6 +162,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;
+	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;
@@ -177,15 +180,31 @@ static int sr_logv(void *cb_data, int loglevel, const char *format, va_list args
 		seconds = rest_us / G_TIME_SPAN_SECOND;
 		microseconds = rest_us % G_TIME_SPAN_SECOND;
 
-		if (fprintf(stderr, "[%.2" PRIu64 ":%.2u.%.6u] ",
-				minutes, seconds, microseconds) < 0)
-			return SR_ERR;
+		ret = g_fprintf(stderr, "sr: [%.2" PRIu64 ":%.2u.%.6u] ",
+				minutes, seconds, microseconds);
+	} else {
+		ret = fputs("sr: ", stderr);
 	}
-	if (vfprintf(stderr, format, args) < 0)
-		return SR_ERR;
-	if (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;
 }