コミット: 14c7cebbafa3c8806252db3830dad478e33f5113 - packages-apps-AndroidTerm (git)

packages/apps/AndroidTerm

コミットメタ情報

• リビジョン: 14c7cebbafa3c8806252db3830dad478e33f5113 (tree)
• 日時: 2012-03-26 10:21:37
• 作者: Steven Luo <steven+android@stev...>
• コミッター: Jack Palevich

ログメッセージ

Properly handle UTF-8 sequences decoding to C1 control characters

Applications which emit UTF-8 sequences that decode to C1 control
characters expect these sequences to be interpreted as C1 control
characters, so send them back through process() instead of trying to
emit them.

Signed-off-by: Jack Palevich <[e-mail]>

変更サマリ

• modified: src/jackpal/androidterm/session/TerminalEmulator.java

差分

--- a/src/jackpal/androidterm/session/TerminalEmulator.java
+++ b/src/jackpal/androidterm/session/TerminalEmulator.java
@@ -515,8 +515,12 @@ public class TerminalEmulator {
     }
 
     private void process(byte b) {
+        process(b, true);
+    }
+
+    private void process(byte b, boolean doUTF8) {
         // Let the UTF-8 decoder try to handle it if we're in UTF-8 mode
-        if (mUTF8Mode && handleUTF8Sequence(b)) {
+        if (doUTF8 && mUTF8Mode && handleUTF8Sequence(b)) {
             return;
         }
 
@@ -654,7 +658,15 @@ public class TerminalEmulator {
                 decoder.reset();
                 decoder.decode(byteBuf, charBuf, true);
                 decoder.flush(charBuf);
-                emit(charBuf.array());
+
+                char[] chars = charBuf.array();
+                if (chars[0] >= 0x80 && chars[0] <= 0x9f) {
+                    /* Sequence decoded to a C1 control character which needs
+                       to be sent through process() again */
+                    process((byte) chars[0], false);
+                } else {
+                    emit(chars);
+                }
 
                 byteBuf.clear();
                 charBuf.clear();