From 09944e92061620009b2b3c6923dfcae7338e6661 Mon Sep 17 00:00:00 2001
From: Kevin Lamonte <kevin.lamonte@gmail.com>
Date: Sat, 12 Mar 2016 23:01:58 -0500
Subject: [PATCH] Fix telnet new environment option

---
 src/jexer/demos/Demo2.java           |  3 ++
 src/jexer/net/TelnetInputStream.java | 47 ++++++++++++++++++++++------
 src/jexer/net/TelnetSocket.java      |  2 +-
 3 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/src/jexer/demos/Demo2.java b/src/jexer/demos/Demo2.java
index e21d9444..81a458d9 100644
--- a/src/jexer/demos/Demo2.java
+++ b/src/jexer/demos/Demo2.java
@@ -57,6 +57,9 @@ public class Demo2 {
                 System.out.printf("New connection: %s\n", socket);
                 DemoApplication app = new DemoApplication(socket.getInputStream(),
                     socket.getOutputStream());
+                System.out.printf("   language: %s\n",
+                    ((jexer.net.TelnetInputStream) socket.getInputStream()).
+                        getLanguage());
                 (new Thread(app)).start();
             }
         } catch (Exception e) {
diff --git a/src/jexer/net/TelnetInputStream.java b/src/jexer/net/TelnetInputStream.java
index c594d1a2..5541e648 100644
--- a/src/jexer/net/TelnetInputStream.java
+++ b/src/jexer/net/TelnetInputStream.java
@@ -727,15 +727,23 @@ public final class TelnetInputStream extends InputStream
      * fails to handle ESC as defined in RFC 1572.
      */
     private void handleNewEnvironment() {
-        Map<StringBuilder, StringBuilder> newEnv =
-                new TreeMap<StringBuilder, StringBuilder>();
+        Map<String, String> newEnv = new TreeMap<String, String>();
 
         EnvState state = EnvState.INIT;
         StringBuilder name = new StringBuilder();
         StringBuilder value = new StringBuilder();
 
-        for (int i = 0; i < subnegBuffer.size(); i++) {
+        /*
+        System.err.printf("handleNewEnvironment() %d bytes\n",
+            subnegBuffer.size());
+         */
+
+        for (int i = 1; i < subnegBuffer.size(); i++) {
             Byte b = subnegBuffer.get(i);
+            /*
+            System.err.printf("   b: %c %d 0x%02x\n", (char)b.byteValue(),
+                b, b);
+             */
 
             switch (state) {
 
@@ -784,14 +792,22 @@ public final class TelnetInputStream extends InputStream
                     // VAR
                     state = EnvState.NAME;
                     if (value.length() > 0) {
-                        newEnv.put(name, value);
+                        /*
+                        System.err.printf("NAME: '%s' VALUE: '%s'\n",
+                            name, value);
+                         */
+                        newEnv.put(name.toString(), value.toString());
                     }
                     name = new StringBuilder();
                 } else if (b == 3) {
                     // USERVAR
                     state = EnvState.NAME;
                     if (value.length() > 0) {
-                        newEnv.put(name, value);
+                        /*
+                        System.err.printf("NAME: '%s' VALUE: '%s'\n",
+                            name, value);
+                         */
+                        newEnv.put(name.toString(), value.toString());
                     }
                     name = new StringBuilder();
                 } else {
@@ -807,18 +823,21 @@ public final class TelnetInputStream extends InputStream
         }
 
         if ((name.length() > 0) && (value.length() > 0)) {
-            newEnv.put(name, value);
+            /*
+            System.err.printf("NAME: '%s' VALUE: '%s'\n", name, value);
+             */
+            newEnv.put(name.toString(), value.toString());
         }
 
-        for (StringBuilder key: newEnv.keySet()) {
+        for (String key: newEnv.keySet()) {
             if (key.equals("LANG")) {
-                language = newEnv.get(key).toString();
+                language = newEnv.get(key);
             }
             if (key.equals("LOGNAME")) {
-                username = newEnv.get(key).toString();
+                username = newEnv.get(key);
             }
             if (key.equals("USER")) {
-                username = newEnv.get(key).toString();
+                username = newEnv.get(key);
             }
         }
     }
@@ -855,6 +874,10 @@ public final class TelnetInputStream extends InputStream
                         get(i).byteValue());
                 }
                 master.terminalType = terminalString.toString();
+                /*
+                System.err.printf("terminal type: '%s'\n",
+                    master.terminalType);
+                 */
             }
             break;
 
@@ -871,6 +894,10 @@ public final class TelnetInputStream extends InputStream
                     speedString.append((char)subnegBuffer.get(i).byteValue());
                 }
                 master.terminalSpeed = speedString.toString();
+                /*
+                System.err.printf("terminal speed: '%s'\n",
+                    master.terminalSpeed);
+                 */
             }
             break;
 
diff --git a/src/jexer/net/TelnetSocket.java b/src/jexer/net/TelnetSocket.java
index c537858c..a1a35f72 100644
--- a/src/jexer/net/TelnetSocket.java
+++ b/src/jexer/net/TelnetSocket.java
@@ -114,7 +114,7 @@ public final class TelnetSocket extends Socket {
      * If true, request the New Environment option to obtain the client
      * LOGNAME, USER, and LANG variables.
      */
-    boolean doEnvironment;
+    boolean doEnvironment = true;
 
     /**
      * The terminal type reported by the client.
-- 
2.27.0