From ecaab32f023528c3253f3caf71fd25063cc28905 Mon Sep 17 00:00:00 2001 From: zhengchao Date: Tue, 31 Mar 2020 19:52:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3Maat=20JSON=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=BF=87=E9=95=BF=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=9A=E7=94=B1json=E8=BD=AC=E6=8D=A2=E7=9A=84iris=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E7=94=A8\n=E6=8D=A2=E8=A1=8C=EF=BC=8C=E4=BD=86?= =?UTF-8?q?=E6=98=AF=E8=AF=BB=E5=8F=96iris=E6=A0=BC=E5=BC=8F=E6=97=B6?= =?UTF-8?q?=E5=85=88=E6=90=9C=E7=B4=A2"\r"=E5=90=8E=E6=90=9C=E7=B4=A2"\n"?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=90=9C=E7=B4=A2=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=BF=87=E9=95=BF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entry/Maat_rule.cpp | 2 +- src/entry/config_monitor.cpp | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) 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)