Redstoner/CommandManager
Archived
0
Fork 0
Code Pull Requests Activity

Changed quote escaping to space escaping

Browse Source
This commit is contained in:
NEMESIS13cz
2017-05-09 18:48:27 +02:00
parent 98f34d1dcd
commit 9f2cdcf418
1 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/java/com/nemez/cmdmgr/util/Executable.java
View File

@@ -295,41 +295,28 @@ public class Executable extends org.bukkit.command.Command {
if (args_.length == 0) { if (args_.length == 0) {
args = new String[0]; args = new String[0];
}else{ }else{
char[] rawArgs = (String.join(" ", args_) + ' ').toCharArray(); ArrayList<String> tempArgs = new ArrayList<String>();
int argSize = 0; String temp = "";
char last = '\0'; int counter = 0;
boolean inString = false; for (String s : args_) {
if (s.endsWith("\\")) {
for (char c : rawArgs) { if ((s.length() > 1 && s.charAt(s.length() - 2) == '\\') || counter + 1 == args_.length) {
if (c == '"') { // escaped \
if (last != '\\') { tempArgs.add(temp + s.replace("\\\\", "\\"));
inString = !inString; temp = "";
}
}else if (c == ' ' && !inString) {
argSize++;
}
last = c;
}
last = '\0';
args = new String[argSize];
String buffer = "";
int index = 0;
for (char c : rawArgs) {
if (c == '"') {
if (last != '\\') {
inString = !inString;
}else{ }else{
buffer = buffer.substring(0, buffer.length() - 1) + '"'; // unescaped \
temp += s.substring(0, s.length() - 1).replace("\\\\", "\\") + " ";
} }
}else if (c == ' ' && !inString) {
args[index] = buffer;
buffer = "";
index++;
}else{ }else{
buffer += c; tempArgs.add(temp + s);
temp = "";
} }
last = c; counter++;
}
args = new String[tempArgs.size()];
for (int i = 0; i < args.length; i++) {
args[i] = tempArgs.get(i);
} }
} }
ArrayList<ExecutableDefinition> defs = new ArrayList<ExecutableDefinition>(); ArrayList<ExecutableDefinition> defs = new ArrayList<ExecutableDefinition>();