ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9052 from mirelachirica/at_handler_fix_consume_to_stop_tag 

Cellular: Rewrite AT handler consume to tag
pull/9101/head
Cruz Monrreal 2018-12-13 18:15:42 -06:00 committed by GitHub
parent 839e00509b 806e95cf67
commit 945a52df1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
features/cellular/framework/AT/ATHandler.cpp
View File

@ -952,26 +952,32 @@ bool ATHandler::consume_char(char ch)
bool ATHandler::consume_to_tag(const char *tag, bool consume_tag) bool ATHandler::consume_to_tag(const char *tag, bool consume_tag)
{ {
size_t match_pos = 0; size_t match_pos = 0;
size_t tag_length = strlen(tag);
while (true) { while (true) {
int c = get_char(); int c = get_char();
if (c == -1) { if (c == -1) {
break;
// compares c against tag at current position and if this match fails
// compares c against tag[0] and also resets match_pos to 0
} else if (c == tag[match_pos] || ((match_pos = 1) && (c == tag[--match_pos]))) {
match_pos++;
if (match_pos == strlen(tag)) {
if (!consume_tag) {
_recv_pos -= strlen(tag);
}
return true;
}
}
}
tr_debug("consume_to_tag not found"); tr_debug("consume_to_tag not found");
return false; return false;
} }
if (c == tag[match_pos]) {
match_pos++;
} else if (match_pos != 0) {
match_pos = 0;
if (c == tag[match_pos]) {
match_pos++;
}
}
if (match_pos == tag_length) {
break;
}
}
if (!consume_tag) {
_recv_pos -= tag_length;
}
return true;
}
bool ATHandler::consume_to_stop_tag() bool ATHandler::consume_to_stop_tag()
{ {