eessppeelllloo/esp8266_deauther
1
0
Fork 0
mirror of https://github.com/SpacehuhnTech/esp8266_deauther.git synced 2025-12-23 15:10:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improved Serial command parser

Browse Source
This commit is contained in:
Stefan Kremser
2018-03-28 12:53:02 +02:00
parent 01d62dda2a
commit 617b0d5676
1 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
esp8266_deauther/SerialInterface.cpp
View File

@@ -130,6 +130,7 @@ void SerialInterface::runCommands(String input) {
String tmp; String tmp;
for (int i = 0; i < input.length(); i++) { for (int i = 0; i < input.length(); i++) {
// when 2 semicolons in a row without a backslash escaping the first
if (input.charAt(i) == SEMICOLON && input.charAt(i + 1) == SEMICOLON && input.charAt(i - 1) != BACKSLASH) { if (input.charAt(i) == SEMICOLON && input.charAt(i + 1) == SEMICOLON && input.charAt(i - 1) != BACKSLASH) {
runCommand(tmp); runCommand(tmp);
tmp = String(); tmp = String();
@@ -144,6 +145,7 @@ void SerialInterface::runCommands(String input) {
} }
void SerialInterface::runCommand(String input) { void SerialInterface::runCommand(String input) {
input
input.replace(String(NEWLINE), String()); input.replace(String(NEWLINE), String());
input.replace(String(CARRIAGERETURN), String()); input.replace(String(CARRIAGERETURN), String());
@@ -152,20 +154,40 @@ void SerialInterface::runCommand(String input) {
// parse/split input in list // parse/split input in list
String tmp; String tmp;
bool withinQuotes = false; bool withinQuotes = false;
bool escaped = false;
char c;
for (int i = 0; i < input.length() && i < 512; i++) { for (int i = 0; i < input.length() && i < 512; i++) {
if ((input.charAt(i) == SPACE && input.charAt(i - 1) != BACKSLASH && !withinQuotes) || input.charAt(i) == CARRIAGERETURN || input.charAt(i) == NEWLINE) { c = input.charAt(i);
//tmp.toLowerCase();
if (tmp.length() > 0) list->add(tmp); // when char is an unescaped \
tmp = String(); if(!escaped && c == BACKSLASH){
} else if(input.charAt(i) == DOUBLEQUOTES && (input.charAt(i-1) != BACKSLASH || (input.charAt(i-1) == BACKSLASH && input.charAt(i-2) == BACKSLASH))){ escaped = true;
}
// (when char is a unescaped space AND it's not within quotes) OR char is \r or \n
else if (c == SPACE && !escaped && !withinQuotes) || c == CARRIAGERETURN || c == NEWLINE) {
// when tmp string isn't empty, add it to the list
if (tmp.length() > 0){
list->add(tmp);
tmp = String(); // reset tmp string
}
}
// when char is an unescaped "
else if(c == DOUBLEQUOTES && !escaped){
// update wheter or not the following chars are within quotes or not
withinQuotes = !withinQuotes; withinQuotes = !withinQuotes;
if(tmp.length() == 0 && !withinQuotes) tmp += SPACE; if(tmp.length() == 0 && !withinQuotes) tmp += SPACE; // when exiting quotes and tmp string is empty, add a space
} else if (input.charAt(i) != BACKSLASH || (input.charAt(i) == BACKSLASH && input.charAt(i - 1) == BACKSLASH)) { }
tmp += input.charAt(i);
// add character to tmp string
else {
tmp += c
escaped = false;
} }
} }
// add whatever is left from the loop above // add string if something is left from the loop above
if (tmp.length() > 0) list->add(tmp); if (tmp.length() > 0) list->add(tmp);
// stop when input is empty/invalid // stop when input is empty/invalid