Handle url handlers (heh) with quotes in properly.

Issue 1228

git-svn-id: http://svn.dmdirc.com/trunk@4064 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/util/URLHandler.java

@@ -33,7 +33,9 @@ import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /** Handles URLs. */
 public class URLHandler {
@@ -223,15 +225,50 @@ public class URLHandler {
      * @param command Application and arguments
      */
     private void execApp(final String command) {
-        String[] commandLine = command.split(" ");
-
         try {
-            Runtime.getRuntime().exec(commandLine);
+            Runtime.getRuntime().exec(parseArguments(command));
         } catch (IOException ex) {
             Logger.userError(ErrorLevel.LOW, "Unable to run application: ",
                     ex.getMessage());
         }
     }
+    
+    /**
+     * Parses the specified command into an array of arguments. Arguments are
+     * separated by spaces. Multi-word arguments may be specified by starting
+     * the argument with a quote (") and finishing it with a quote (").
+     * 
+     * @param command The command to parse
+     * @return An array of arguments corresponding to the command
+     */
+    protected static String[] parseArguments(final String command) {
+        final List<String> args = new ArrayList<String>();
+        final StringBuilder builder = new StringBuilder();
+        boolean inquote = false;
+        
+        for (String word : command.split(" ")) {
+            if (word.endsWith("\"") && inquote) {
+                args.add(builder.toString() + ' ' + word.substring(0, word.length() - 1));
+                builder.delete(0, builder.length());
+                inquote = false;
+            } else if (inquote) {
+                if (builder.length() > 0) {
+                    builder.append(' ');
+                }
+                
+                builder.append(word);
+            } else if (word.startsWith("\"") && !word.endsWith("\"")) {
+                inquote = true;
+                builder.append(word.substring(1));
+            } else if (word.startsWith("\"") && word.endsWith("\"")) {
+                args.add(word.substring(1, word.length() - 1));
+            } else {
+                args.add(word);
+            }
+        }
+        
+        return args.toArray(new String[0]);
+    }
 
     /**
      * Opens the specified URL in the users browser.

test/com/dmdirc/util/URLHandlerTest.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.util;
+
+import java.util.Arrays;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class URLHandlerTest extends junit.framework.TestCase {
+    
+    @Test
+    public void testParseArguments() {
+        final String[][][] tests = new String[][][]{
+            {{"abcdef abcdef abcdef"}, {"abcdef", "abcdef", "abcdef"}},
+            {{"abcdef \"abcdef abcdef\""}, {"abcdef", "abcdef abcdef"}},
+            {{"abcdef \"abcdef\" \"abcdef\""}, {"abcdef", "abcdef", "abcdef"}},
+        };
+        
+        for (String[][] test : tests) {
+            final String[] res = URLHandler.parseArguments(test[0][0]);
+            assertTrue(test[0][0] + " - " + Arrays.toString(test[1]) + " - "
+                    + Arrays.toString(res),
+                    Arrays.equals(test[1], res));
+        }
+    }
+    
+}