ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am de42d34c: Merge "logd: regression in log_strtok_r"

Browse source 
* commit 'de42d34cd5de2ca3ecc89b155ea866e98a5d5568':
  logd: regression in log_strtok_r
This commit is contained in:
Mark Salyzyn 2015-06-12 22:43:08 +00:00 • committed by Android Git Automerger
commit 363963d613
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
logd/LogKlog.cpp
View file

@ -68,6 +68,9 @@ static char *is_timestamp(char *s) {
continue;
}
if (!isdigit(c) && (c == ']')) {
if (first_period || (*s != ' ')) {
break;
}
return s;
}
}
@ -75,7 +78,7 @@ static char *is_timestamp(char *s) {
}
// Like strtok_r with "\r\n" except that we look for log signatures (regex)
// \(\(<[0-9]+>\)\([[] *[0-9]+[]]\)\{0,1\}\|[[] *[0-9]+[]]\)
// \(\(<[0-9]+>\)\([[] *[0-9]+[.][0-9]+[]] \)\{0,1\}\|[[] *[0-9]+[.][0-9]+[]] \)
// and split if we see a second one without a newline.
#define SIGNATURE_MASK 0xF0