rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Code Issues Releases Activity

Fixing findUntil() problem with repeated initial characters. (Jeffery.zksun)

Browse Source 
http://code.google.com/p/arduino/issues/detail?id=768
This commit is contained in:
David A. Mellis 2012-01-02 13:49:59 -05:00
parent cce4ef7c69
commit 5088b09f2d
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hardware/arduino/cores/arduino/Stream.cpp
View File

@ -101,23 +101,25 @@ bool Stream::findUntil(char *target, size_t targetLen, char *terminator, size_t
int c;
if( *target == 0)
return true; // return true if target is a null string
return true; // return true if target is a null string
while( (c = timedRead()) > 0){
if(c != target[index])
index = 0; // reset index if any char does not match
if( c == target[index]){
//////Serial.print("found "); Serial.write(c); Serial.print("index now"); Serial.println(index+1);
//////Serial.print("found "); Serial.write(c); Serial.print("index now"); Serial.println(index+1);
if(++index >= targetLen){ // return true if all chars in the target match
return true;
}
}
else{
index = 0; // reset index if any char does not match
}
if(termLen > 0 && c == terminator[termIndex]){
if(++termIndex >= termLen)
return false; // return false if terminate string found before target string
if(++termIndex >= termLen)
return false; // return false if terminate string found before target string
}
else
termIndex = 0;
termIndex = 0;
}
return false;
}