giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added support for quote-delimited arguments when calling external commands from Cooja

Browse Source
This commit is contained in:
simonduq 2012-08-15 17:15:26 +02:00 committed by Niclas Finne
parent c5e9d688a5
commit 24dba740e2
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/cooja/java/se/sics/cooja/dialogs/CompileContiki.java
View File

@ -44,6 +44,8 @@ import java.io.OutputStreamWriter;
import java.io.Reader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
import javax.swing.Action;
@ -87,8 +89,13 @@ public class CompileContiki {
final MessageList compilationOutput,
boolean synchronous)
throws Exception {
/* TODO Split into correct arguments: parse " and ' */
return compile(command.split(" "), env, outputFile, directory, onSuccess, onFailure, compilationOutput, synchronous);
Pattern p = Pattern.compile("([^\\s\"']|\"[^\"]*\"|'[^']*')+");
Matcher m = p.matcher(command);
ArrayList<String> commandList = new ArrayList<String>();
while(m.find()) {
commandList.add(m.group().replaceAll("['\"]",""));
}
return compile(commandList.toArray(new String[commandList.size()]), env, outputFile, directory, onSuccess, onFailure, compilationOutput, synchronous);
}
/**