ssh: update DirectCommand to use SshOutputStream

Motivation:
as DirectCommand prints the result of the commands to a console it
should follow the same rules as AnsiTerminalCommand output (\r\n)

Modification:
Pull SshOutputStream out of AnsiTerminalCommand and update DirectCommand
to use by when printing the output.

Result:
Correct direct command output if some terminal configurations.

Acked-by: Lea Morschel
Acked-by: Paul Millar
Acked-by: Dmitry Litvintsev
Target: master
Require-book: no
Require-notes: no

modules/dcache/src/main/java/org/dcache/services/ssh2/AnsiTerminalCommand.java

@@ -13,7 +13,6 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.io.FilterOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InterruptedIOException;
@@ -292,23 +291,6 @@ public int getWidth() {
         }
     }
 
-    private static class SshOutputStream extends FilterOutputStream
-    {
-        public SshOutputStream(OutputStream out) {
-            super(out);
-        }
-
-        @Override
-        public void write(int c) throws IOException {
-            if (c == '\n') {
-                super.write(0xa);
-                super.write(0xd);
-            } else {
-                super.write(c);
-            }
-        }
-    }
-
     private class Pipe implements Runnable
     {
         public static final int CTRL_C = 3;

modules/dcache/src/main/java/org/dcache/services/ssh2/DirectCommand.java

@@ -134,7 +134,7 @@ public void destroy() {
 
     @Override
     public void setErrorStream(OutputStream err) {
-        errorWriter = new PrintWriter(err);
+        errorWriter = new PrintWriter(new SshOutputStream(err));
     }
 
     @Override
@@ -149,7 +149,7 @@ public void setInputStream(InputStream in) {
 
     @Override
     public void setOutputStream(OutputStream out) {
-        outWriter = new PrintWriter(out);
+        outWriter = new PrintWriter(new SshOutputStream(out));
     }
 
     @Override

modules/dcache/src/main/java/org/dcache/services/ssh2/SshOutputStream.java

@@ -0,0 +1,21 @@
+package org.dcache.services.ssh2;
+
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+class SshOutputStream extends FilterOutputStream {
+    public SshOutputStream(OutputStream out) {
+        super(out);
+    }
+
+    @Override
+    public void write(int c) throws IOException {
+        if (c == '\n') {
+            super.write(0xa);
+            super.write(0xd);
+        } else {
+            super.write(c);
+        }
+    }
+}