Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3c5093a authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

logd: regression in log_strtok_r 

In commit 'logd: fix kernel logline stutter'
2c3b300f we introduced log_strtok_r.
as a replacement for strtok_r that dealt with a problem with
some kernel log messages. Fix is to refine definition of
is_timestamp to not match on patterns like [0].

Change-Id: I0867a555a3bca09bbf18d18e75e41dffffe57a22
parent 57bd480c

logd/LogKlog.cpp

+4 −1
Original line number Diff line number Diff line
@@ -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