svn commit: r1344789 - /karaf/branches/karaf-2.3.x/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java

[cs...@apache.org]

Author: cschneider
Date: Thu May 31 15:56:57 2012
New Revision: 1344789

URL: http://svn.apache.org/viewvc?rev=1344789&view=rev
Log:
Merged revision(s) 1344768 from karaf/trunk:
KARAF-536 Setting the terminal columns when doing ssh:ssh
........

Modified:
    karaf/branches/karaf-2.3.x/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java

Modified: karaf/branches/karaf-2.3.x/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java?rev=1344789&r1=1344788&r2=1344789&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java (original)
+++ karaf/branches/karaf-2.3.x/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java Thu May 31 15:56:57 2012
@@ -23,6 +23,8 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.List;
 
+import jline.Terminal;
+
 import org.apache.felix.gogo.commands.Argument;
 import org.apache.felix.gogo.commands.Command;
 import org.apache.felix.gogo.commands.Option;
@@ -166,6 +168,7 @@ public class SshAction
                 } else {
                     channel = sshSession.createChannel("shell");
                     channel.setIn(new NoCloseInputStream(System.in));
+                    ((ChannelShell) channel).setPtyColumns(getTermWidth());
                     ((ChannelShell) channel).setupSensibleDefaultPty();
                     ((ChannelShell) channel).setAgentForwarding(true);
                 }
@@ -184,6 +187,11 @@ public class SshAction
         return null;
     }
 
+    private int getTermWidth() {
+        Terminal term = (Terminal) session.get(".jline.terminal");
+        return term != null ? term.getWidth() : 80;
+    }
+
     public String readLine(String msg) throws IOException {
         StringBuffer sb = new StringBuffer();
         System.err.print(msg);