Changeset 5534

Timestamp:

Dec 20, 2010, 9:17:46 AM (12 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1565: Command line options for the external program executor that contain quotes are not handled correctly

Location:

trunk/src

Files:

• core/net/sf/basedb/core/StringUtil.java (modified) (1 diff)
• plugins/core/net/sf/basedb/plugins/executor/ExternalProgramExecutor.java (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/StringUtil.java

@@ -182 +182 @@
     regular expression, optionally ignoring matches that are inside
     quotes.
+    
     @param s The string to tokenize
     @param regexp The regular expression for matching split sites
+    @param notInsideQuotes If TRUE, the regexp is not matched inside quotes
     @return An array with the elements of the array
     @since 2.15
   */
-  public static final String[] tokenize(String s, String regexp, boolean notInsideQoutes)
+  public static final String[] tokenize(String s, String regexp, boolean notInsideQuotes)
+  {
+    return tokenize(s, regexp, notInsideQuotes, false);
+  }
+
+  /**
+    Tokenize a string by splitting it at positions matching the
+    regular expression. Matches that are inside quotes can optionally
+    be ignored. Elements with quotes can optionally have the quotes
+    removed.
+    
+    @param s The string to tokenize
+    @param regexp The regular expression for matching split sites
+    @param notInsideQuotes If TRUE, the regexp is not matched inside quotes
+    @param removeQuotes If TRUE, remove quotes from all elements before returning the
+      result 
+      
+    @return An array with the elements of the array
+    @since 2.17
+  */
+  public static final String[] tokenize(String s, String regexp, boolean notInsideQuotes, boolean removeQuotes)
   {
     String[] result = null;
     if (s != null && regexp != null)
     {
-      if (notInsideQoutes) regexp += "(?=(?:[^\"]*\"[^\"]*\")*(?![^\"]*\"))";
+      if (notInsideQuotes) regexp += "(?=(?:[^\"]*\"[^\"]*\")*(?![^\"]*\"))";
       result = s.split(regexp);
+      if (removeQuotes)
+      {
+        for (int i = 0; i < result.length; ++i)
+        {
+          String t = result[i];
+          if (t != null && t.startsWith("\"") && t.endsWith("\""))
+          {
+            result[i] = t.substring(1, t.length()-1);
+          }
+        }
+      }
     }
     return result;
   }
-  
+
 
   /**

trunk/src/plugins/core/net/sf/basedb/plugins/executor/ExternalProgramExecutor.java

@@ -721 +721 @@
     if (cmdLine != null) 
     {
-      // Split on whitespace but not inside quotes
-      cmds.addAll(Arrays.asList(StringUtil.tokenize(cmdLine, "\\s+", true)));
+      // Split on whitespace but not inside quotes; quotes are removed
+      String[] options = StringUtil.tokenize(cmdLine, "\\s+", true, true);
+      if (options != null)
+      {
+        cmds.addAll(Arrays.asList(options));
+      }
     }
     builder.command(cmds);