diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp index 052001f..0097105 100644 --- a/src/entry/Maat_rule.cpp +++ b/src/entry/Maat_rule.cpp @@ -33,7 +33,7 @@ #include "stream_fuzzy_hash.h" #include "gram_index_engine.h" -int MAAT_FRAME_VERSION_2_8_20200304=1; +int MAAT_FRAME_VERSION_2_8_20200331=1; int is_valid_table_name(const char* str) { diff --git a/src/entry/config_monitor.cpp b/src/entry/config_monitor.cpp index 83dde83..1a80fff 100644 --- a/src/entry/config_monitor.cpp +++ b/src/entry/config_monitor.cpp @@ -32,18 +32,11 @@ char* read_nxt_line_from_buff(const char* buff, size_t buff_size, size_t* offset { int this_offset=0; const char* p; - //search for CRLF, aka '\r', '\n' or "\r\n" - p=(const char*)memchr(buff+*offset,'\r',buff_size-*offset); - if(p==NULL) + //search for CRLF, aka CR '\r'(old Mac), LF '\n'(UNIX) or CRLF"\r\n" (Windows) + p=(const char*)memchr(buff+*offset,'\n',buff_size-*offset); + if(p==NULL)// NOT "\n" or "\r\n" { - p=(const char*)memchr(buff+*offset,'\n',buff_size-*offset); - } - else - { - if((size_t)(p-buff)