From 59382a53ad9a87fcff1911be65d68e97099bbd90 Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Tue, 22 Sep 2009 16:04:54 +0000
Subject:  * fix DBCS detection: DEL is 0x7f not 0x1f

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4880 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 mbbsd/telnet.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'mbbsd/telnet.c')

diff --git a/mbbsd/telnet.c b/mbbsd/telnet.c
index 933f9f3c..22ad6234 100644
--- a/mbbsd/telnet.c
+++ b/mbbsd/telnet.c
@@ -53,11 +53,18 @@ dbcs_detect_evil_repeats(unsigned char *buf, ssize_t l)
 	// XXX l=2 is dangerous. hope we are not in telnet IAC state...
 	// BS:	\b
 	// BS2:	\x7f
+	// DEL2: Ctrl('D') (KKMan3 also treats Ctrl('D') as DBCS DEL)
 	if (buf[0] != buf[1])
 	    return l;
 
+	// Note: BS/DEL behavior on different clients:
+	// screen/telnet:BS=0x7F, DEL=^[3~
+	// PCMan2004:    BS=0x7F, DEL=^[3~
+	// KKMan3:       BS=0x1b, DEL=0x7F
+	// WinXP telnet: BS=0x1b, DEL=0x7F
 	if (buf[0] == '\b' ||
-	    buf[0] == '\x1f')
+	    buf[0] == '\x7f' ||
+	    buf[0] == Ctrl('D'))
 	    return l-1;
     } 
     else if (l == 6)
-- 
cgit v1.2.3