--- a/uptools/libcoding/gsm7_decode.c	Thu Mar 25 01:40:36 2021 +0000
+++ b/uptools/libcoding/gsm7_decode.c	Thu Mar 25 02:58:30 2021 +0000
@@ -4,6 +4,7 @@
  */
 
 #include <sys/types.h>
+#include <stdio.h>
 
 extern u_short gsm7_decode_table[128];
 extern u_short gsm7ext_decode_table[128];
@@ -13,33 +14,53 @@
 	unsigned inlen, *outlenp, *errp;
 {
 	u_char *inp, *endp, *outp;
-	unsigned errcnt = 0;
 	unsigned gsm, uni;
+	int is_ext;
 
 	inp = inbuf;
 	endp = inbuf + inlen;
 	outp = outbuf;
 	while (inp < endp) {
 		gsm = *inp++;
-		if (gsm == 0x1B && inp < endp)
-			uni = gsm7ext_decode_table[*inp++];
-		else
+		if (gsm == 0x1B && inp < endp && *inp != 0x1B && *inp != '\n'
+		    && *inp != '\r') {
+			gsm = *inp++;
+			uni = gsm7ext_decode_table[gsm];
+			if (uni == '\\') {
+				*outp++ = '\\';
+				*outp++ = '\\';
+				continue;
+			}
+			is_ext = 1;
+		} else {
+			switch (gsm) {
+			case 0x1B:
+				*outp++ = '\\';
+				*outp++ = 'e';
+				continue;
+			case '\n':
+				if (newline_ok)
+					*outp++ = '\n';
+				else {
+					*outp++ = '\\';
+					*outp++ = 'n';
+				}
+				continue;
+			case '\r':
+				*outp++ = '\\';
+				*outp++ = 'r';
+				continue;
+			}
 			uni = gsm7_decode_table[gsm];
-		if (uni == '\r') {
-			*outp++ = '\\';
-			*outp++ = 'r';
-			errcnt++;
-		} else if (uni == '\n') {
-			if (newline_ok)
-				*outp++ = '\n';
-			else {
+			is_ext = 0;
+		}
+		if (!uni || !is_decoded_char_ok(uni, ascii_ext)) {
+			if (is_ext) {
 				*outp++ = '\\';
-				*outp++ = 'n';
-				errcnt++;
+				*outp++ = 'e';
 			}
-		} else if (!uni || !is_decoded_char_ok(uni, ascii_ext)) {
-			*outp++ = '?';
-			errcnt++;
+			sprintf(outp, "\\%02X", gsm);
+			outp += 3;
 		} else if (ascii_ext == 2)
 			outp += emit_utf8_char(uni, outp);
 		else
@@ -49,5 +70,5 @@
 	if (outlenp)
 		*outlenp = outp - outbuf;
 	if (errp)
-		*errp = errcnt;
+		*errp = 0;
 }