In gpsmon, omit hexdumping trailing CR/LF when dumping textual packets.

2 files changed, 11 insertions, 4 deletions

diff --git a/gpsmon.c b/gpsmon.c
index 59405d53..221a49de 100644
--- a/gpsmon.c
+++ b/gpsmon.c
@@ -204,6 +204,12 @@ static void cond_hexdump(/*@out@*/char *buf2, size_t len2,
 		buf2[j] = '\0';
 	    }
 	    else {
+		if (TEXTUAL_PACKET_TYPE(session.lexer.type)) {
+		    if (i == len - 1 && buf[i] == '\n')
+			continue;
+		    if (i == len - 2 && buf[i] == '\r')
+			continue;
+		}
 		(void)snprintf(&buf2[j], len2-strlen(buf2), "\\x%02x", (unsigned int)(buf[i] & 0xff));
 		j = strlen(buf2);
 	    }
diff --git a/gpsmon.xml b/gpsmon.xml
index 58198e7b..876b486f 100644
--- a/gpsmon.xml
+++ b/gpsmon.xml
@@ -156,10 +156,11 @@ the contents of several especially interesting packet types.  The
 second and the system clock at that time.</para>
 
 <para>The bottom half of the screen is a scrolling hex dump of all
-packets the GPS is issuing.  Dump lines beginning &gt;&gt;&gt;
-represent control packets sent to the GPS. Lines consisting of "PPS"
-surrounded by dashes, if present, indicate 1PPS and the start of the
-reporting cycle.</para>
+packets the GPS is issuing.  If the packet type is textual, any
+trailing CR/LF is omitted. Dump lines beginning &gt;&gt;&gt; represent
+control packets sent to the GPS. Lines consisting of "PPS" surrounded
+by dashes, if present, indicate 1PPS and the start of the reporting
+cycle.</para>
 
 </refsect1>
 <refsect1 id='commands'><title>COMMANDS</title>