From 7da0d390003a2c2e86848cd96ebcd4b3473993f0 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 13 Mar 2017 11:53:20 -0400
Subject: [PATCH] Argument processing mistake.

---
 cli/src/main/java/hudson/cli/CLI.java                    | 5 ++++-
 cli/src/test/java/hudson/cli/PrivateKeyProviderTest.java | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cli/src/main/java/hudson/cli/CLI.java b/cli/src/main/java/hudson/cli/CLI.java
index 848ec0d0cd..2e5dd4d0f8 100644
--- a/cli/src/main/java/hudson/cli/CLI.java
+++ b/cli/src/main/java/hudson/cli/CLI.java
@@ -434,6 +434,7 @@ public class CLI implements AutoCloseable {
                 }
                 mode = Mode.HTTP;
                 args = args.subList(1, args.size());
+                continue;
             }
             if (head.equals("-ssh")) {
                 if (mode != null) {
@@ -442,6 +443,7 @@ public class CLI implements AutoCloseable {
                 }
                 mode = Mode.SSH;
                 args = args.subList(1, args.size());
+                continue;
             }
             if (head.equals("-remoting")) {
                 if (mode != null) {
@@ -450,6 +452,7 @@ public class CLI implements AutoCloseable {
                 }
                 mode = Mode.REMOTING;
                 args = args.subList(1, args.size());
+                continue;
             }
             if(head.equals("-s") && args.size()>=2) {
                 url = args.get(1);
@@ -697,7 +700,7 @@ public class CLI implements AutoCloseable {
             public void run() {
                 try {
                     int c;
-                    while ((c = System.in.read()) != -1) {
+                    while ((c = System.in.read()) != -1) { // TODO use InputStream.available
                        stdin.write(c);
                     }
                     connection.sendEndStdin();
diff --git a/cli/src/test/java/hudson/cli/PrivateKeyProviderTest.java b/cli/src/test/java/hudson/cli/PrivateKeyProviderTest.java
index 376b1fa815..8697026508 100644
--- a/cli/src/test/java/hudson/cli/PrivateKeyProviderTest.java
+++ b/cli/src/test/java/hudson/cli/PrivateKeyProviderTest.java
@@ -57,7 +57,7 @@ public class PrivateKeyProviderTest {
         final File dsaKey = keyFile(".ssh/id_dsa");
         final File rsaKey = keyFile(".ssh/id_rsa");
 
-        run("-i", dsaKey.getAbsolutePath(), "-i", rsaKey.getAbsolutePath(), "-s", "http://example.com");
+        run("-remoting", "-i", dsaKey.getAbsolutePath(), "-i", rsaKey.getAbsolutePath(), "-s", "http://example.com");
 
         verify(cli).authenticate(withKeyPairs(
                 keyPair(dsaKey),
@@ -73,7 +73,7 @@ public class PrivateKeyProviderTest {
         final File dsaKey = keyFile(".ssh/id_dsa");
 
         fakeHome();
-        run("-s", "http://example.com");
+        run("-remoting", "-s", "http://example.com");
 
         verify(cli).authenticate(withKeyPairs(
                 keyPair(rsaKey),