Merge "logcat: white and blacklist failure"
This commit is contained in:
commit
e148b7ebd0
4 changed files with 20 additions and 5 deletions
|
@ -807,7 +807,10 @@ int main(int argc, char **argv)
|
|||
// squash out the byte count
|
||||
cp = buf;
|
||||
if (!truncated) {
|
||||
while (isdigit(*cp) || (*cp == '\n')) {
|
||||
while (isdigit(*cp)) {
|
||||
++cp;
|
||||
}
|
||||
if (*cp == '\n') {
|
||||
++cp;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -601,7 +601,7 @@ TEST(logcat, white_black_adjust) {
|
|||
|
||||
ASSERT_EQ(true, get_white_black(&list));
|
||||
|
||||
static const char adjustment[] = "~! ~1000";
|
||||
static const char adjustment[] = "~! 300/20 300/25 2000 ~1000/5 ~1000/30";
|
||||
ASSERT_EQ(true, set_white_black(adjustment));
|
||||
ASSERT_EQ(true, get_white_black(&adjust));
|
||||
if (strcmp(adjustment, adjust)) {
|
||||
|
@ -611,6 +611,16 @@ TEST(logcat, white_black_adjust) {
|
|||
free(adjust);
|
||||
adjust = NULL;
|
||||
|
||||
static const char adjustment2[] = "300/20 300/21 2000 ~1000";
|
||||
ASSERT_EQ(true, set_white_black(adjustment2));
|
||||
ASSERT_EQ(true, get_white_black(&adjust));
|
||||
if (strcmp(adjustment2, adjust)) {
|
||||
fprintf(stderr, "ERROR: '%s' != '%s'\n", adjustment2, adjust);
|
||||
}
|
||||
ASSERT_STREQ(adjustment2, adjust);
|
||||
free(adjust);
|
||||
adjust = NULL;
|
||||
|
||||
ASSERT_EQ(true, set_white_black(list));
|
||||
ASSERT_EQ(true, get_white_black(&adjust));
|
||||
if (strcmp(list, adjust)) {
|
||||
|
|
|
@ -95,7 +95,9 @@ bool LogListener::onDataAvailable(SocketClient *cli) {
|
|||
msg += sizeof(log_time);
|
||||
n -= sizeof(log_time);
|
||||
|
||||
unsigned short len = n;
|
||||
// NB: hdr.msg_flags & MSG_TRUNC is not tested, silently passing a
|
||||
// truncated message to the logs.
|
||||
unsigned short len = n; // cap to internal maximum
|
||||
if (len == n) {
|
||||
logbuf->log(log_id, realtime, cred->uid, cred->pid, tid, msg, len);
|
||||
reader->notifyNewLog();
|
||||
|
|
|
@ -154,8 +154,8 @@ int PruneList::init(char *str) {
|
|||
}
|
||||
m = pid - p->mPid;
|
||||
}
|
||||
if (m >= 0) {
|
||||
if (m > 0) {
|
||||
if (m <= 0) {
|
||||
if (m < 0) {
|
||||
list->insert(it, new Prune(uid,pid));
|
||||
}
|
||||
break;
|
||||
|
|
Loading…
Reference in a new issue