git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix telnet new environment option
[fanfix.git]
/
src
/
jexer
/
net
/
TelnetInputStream.java
diff --git
a/src/jexer/net/TelnetInputStream.java
b/src/jexer/net/TelnetInputStream.java
index c594d1a275aff7c91435c2b62fc3a58d522a521e..5541e64804b7384a5c8ba8d5d5e58b3beef026aa 100644
(file)
--- 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() {
* 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();
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);
Byte b = subnegBuffer.get(i);
+ /*
+ System.err.printf(" b: %c %d 0x%02x\n", (char)b.byteValue(),
+ b, b);
+ */
switch (state) {
switch (state) {
@@
-784,14
+792,22
@@
public final class TelnetInputStream extends InputStream
// VAR
state = EnvState.NAME;
if (value.length() > 0) {
// 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) {
}
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 {
}
name = new StringBuilder();
} else {
@@
-807,18
+823,21
@@
public final class TelnetInputStream extends InputStream
}
if ((name.length() > 0) && (value.length() > 0)) {
}
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 (String
Builder
key: newEnv.keySet()) {
+ for (String key: newEnv.keySet()) {
if (key.equals("LANG")) {
if (key.equals("LANG")) {
- language = newEnv.get(key)
.toString()
;
+ language = newEnv.get(key);
}
if (key.equals("LOGNAME")) {
}
if (key.equals("LOGNAME")) {
- username = newEnv.get(key)
.toString()
;
+ username = newEnv.get(key);
}
if (key.equals("USER")) {
}
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();
get(i).byteValue());
}
master.terminalType = terminalString.toString();
+ /*
+ System.err.printf("terminal type: '%s'\n",
+ master.terminalType);
+ */
}
break;
}
break;
@@
-871,6
+894,10
@@
public final class TelnetInputStream extends InputStream
speedString.append((char)subnegBuffer.get(i).byteValue());
}
master.terminalSpeed = speedString.toString();
speedString.append((char)subnegBuffer.get(i).byteValue());
}
master.terminalSpeed = speedString.toString();
+ /*
+ System.err.printf("terminal speed: '%s'\n",
+ master.terminalSpeed);
+ */
}
break;
}
break;