X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi.c;h=fbb57472b3301bb4510a622e6295d04bc0438b58;hb=5305266a28c1af09267f43f8941b6012be3d954f;hp=8d46d849b0748ae7f4c76bc6499ba40c1c419cec;hpb=cfd8ec53abc53ad40a94cbb881776b58ed976d3a;p=libsigrok.git

diff --git a/src/scpi/scpi.c b/src/scpi/scpi.c
index 8d46d849..fbb57472 100644
--- a/src/scpi/scpi.c
+++ b/src/scpi/scpi.c
@@ -405,6 +405,10 @@ SR_PRIV int sr_scpi_get_string(struct sr_scpi_dev_inst *scpi,
 	if (response->len >= 1 && response->str[response->len - 1] == '\n')
 		g_string_truncate(response, response->len - 1);
 
+	/* Get rid of trailing carriage return if present */
+	if (response->len >= 1 && response->str[response->len - 1] == '\r')
+		g_string_truncate(response, response->len - 1);
+
 	*scpi_response = response->str;
 	g_string_free(response, FALSE);