Compare commits
No commits in common. 'i10c-beta' and 'c9' have entirely different histories.
@ -1,12 +0,0 @@
|
|||||||
diff -up liblognorm-2.0.6/doc/conf.py.orig liblognorm-2.0.6/doc/conf.py
|
|
||||||
--- liblognorm-2.0.6/doc/conf.py.orig 2022-07-19 14:01:01.094313222 +0200
|
|
||||||
+++ liblognorm-2.0.6/doc/conf.py 2022-07-19 14:01:43.454310057 +0200
|
|
||||||
@@ -56,7 +56,7 @@ release = '1.1.2'
|
|
||||||
|
|
||||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
|
||||||
# for a list of supported languages.
|
|
||||||
-language = None
|
|
||||||
+language = 'en'
|
|
||||||
|
|
||||||
# There are two options for replacing |today|: either, you set today to some
|
|
||||||
# non-false value, then it is used:
|
|
||||||
@ -1,168 +0,0 @@
|
|||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index b6f92f1..752b7d9 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -80,7 +80,7 @@ AC_ARG_ENABLE(regexp,
|
|
||||||
)
|
|
||||||
AM_CONDITIONAL(ENABLE_REGEXP, test x$enable_regexp = xyes)
|
|
||||||
if test "$enable_regexp" = "yes"; then
|
|
||||||
- PKG_CHECK_MODULES(PCRE, libpcre)
|
|
||||||
+ PKG_CHECK_MODULES(PCRE, [libpcre2-8 >= 10.00])
|
|
||||||
AC_DEFINE(FEATURE_REGEXP, 1, [Regular expressions support enabled.])
|
|
||||||
FEATURE_REGEXP=1
|
|
||||||
else
|
|
||||||
@@ -194,5 +194,4 @@ echo "Testbench enabled: $enable_testbench"
|
|
||||||
echo "Valgrind enabled: $enable_valgrind"
|
|
||||||
echo "Debug mode enabled: $enable_debug"
|
|
||||||
echo "Tools enabled: $enable_tools"
|
|
||||||
-echo "Docs enabled: $enable_docs"
|
|
||||||
-
|
|
||||||
+echo "Docs enabled: $enable_docs"
|
|
||||||
\ No newline at end of file
|
|
||||||
diff --git a/src/parser.c b/src/parser.c
|
|
||||||
index 2d70424..dcd5b4e 100644
|
|
||||||
--- a/src/parser.c
|
|
||||||
+++ b/src/parser.c
|
|
||||||
@@ -42,12 +42,6 @@
|
|
||||||
#include "samp.h"
|
|
||||||
#include "helpers.h"
|
|
||||||
|
|
||||||
-#ifdef FEATURE_REGEXP
|
|
||||||
-#include <pcre.h>
|
|
||||||
-#include <errno.h>
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
-
|
|
||||||
/* how should output values be formatted? */
|
|
||||||
enum FMT_MODE {
|
|
||||||
FMT_AS_STRING = 0,
|
|
||||||
diff --git a/src/v1_parser.c b/src/v1_parser.c
|
|
||||||
index 323ada0..9fb3ccb 100644
|
|
||||||
--- a/src/v1_parser.c
|
|
||||||
+++ b/src/v1_parser.c
|
|
||||||
@@ -39,7 +39,8 @@
|
|
||||||
#include "v1_samp.h"
|
|
||||||
|
|
||||||
#ifdef FEATURE_REGEXP
|
|
||||||
-#include <pcre.h>
|
|
||||||
+#define PCRE2_CODE_UNIT_WIDTH 8
|
|
||||||
+#include <pcre2.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@@ -1266,7 +1267,7 @@ void* tokenized_parser_data_constructor(ln_fieldList_t *node, ln_ctx ctx) {
|
|
||||||
* significantly slower than other field-types.
|
|
||||||
*/
|
|
||||||
struct regex_parser_data_s {
|
|
||||||
- pcre *re;
|
|
||||||
+ pcre2_code *re;
|
|
||||||
int consume_group;
|
|
||||||
int return_group;
|
|
||||||
int max_groups;
|
|
||||||
@@ -1276,17 +1277,33 @@ PARSER(Regex)
|
|
||||||
assert(str != NULL);
|
|
||||||
assert(offs != NULL);
|
|
||||||
assert(parsed != NULL);
|
|
||||||
- unsigned int* ovector = NULL;
|
|
||||||
+ PCRE2_SIZE *ovector;
|
|
||||||
+ pcre2_match_data *match_data = NULL;
|
|
||||||
|
|
||||||
struct regex_parser_data_s *pData = (struct regex_parser_data_s*) node->parser_data;
|
|
||||||
if (pData != NULL) {
|
|
||||||
- ovector = calloc(pData->max_groups, sizeof(unsigned int) * 3);
|
|
||||||
- if (ovector == NULL) FAIL(LN_NOMEM);
|
|
||||||
+ match_data = pcre2_match_data_create_from_pattern(pData->re, NULL);
|
|
||||||
+ if (match_data == NULL) FAIL(LN_NOMEM);
|
|
||||||
+
|
|
||||||
+ int result = pcre2_match(
|
|
||||||
+ pData->re, /* the compiled pattern */
|
|
||||||
+ (PCRE2_SPTR)str, /* the subject string */
|
|
||||||
+ (PCRE2_SIZE)strLen, /* the length of the subject */
|
|
||||||
+ (PCRE2_SIZE)*offs, /* start at offset 0 in the subject */
|
|
||||||
+ 0, /* default options */
|
|
||||||
+ match_data, /* block for storing the result */
|
|
||||||
+ NULL); /* use default match context */
|
|
||||||
|
|
||||||
- int result = pcre_exec(pData->re, NULL, str, strLen, *offs, 0, (int*) ovector, pData->max_groups * 3);
|
|
||||||
if (result == 0) result = pData->max_groups;
|
|
||||||
if (result > pData->consume_group) {
|
|
||||||
- /*please check 'man 3 pcreapi' for cryptic '2 * n' and '2 * n + 1' magic*/
|
|
||||||
+ ovector = pcre2_get_ovector_pointer(match_data);
|
|
||||||
+ printf("Match succeeded at offset %d\n", (int)ovector[0]);
|
|
||||||
+
|
|
||||||
+ /* please check 'man 3 pcre2api' for cryptic '2 * n' and '2 * n + 1' magic
|
|
||||||
+ * in a nutshell, within the ovector, the first in each pair of values is set to the
|
|
||||||
+ * offset of the first code unit of a substring, and the second is set to the
|
|
||||||
+ * offset of the first code unit after the end of a substring.
|
|
||||||
+ */
|
|
||||||
if (ovector[2 * pData->consume_group] == *offs) {
|
|
||||||
*parsed = ovector[2 * pData->consume_group + 1] - ovector[2 * pData->consume_group];
|
|
||||||
if (pData->consume_group != pData->return_group) {
|
|
||||||
@@ -1294,22 +1311,20 @@ PARSER(Regex)
|
|
||||||
if((val = strndup(str + ovector[2 * pData->return_group],
|
|
||||||
ovector[2 * pData->return_group + 1] -
|
|
||||||
ovector[2 * pData->return_group])) == NULL) {
|
|
||||||
- free(ovector);
|
|
||||||
FAIL(LN_NOMEM);
|
|
||||||
}
|
|
||||||
*value = json_object_new_string(val);
|
|
||||||
free(val);
|
|
||||||
if (*value == NULL) {
|
|
||||||
- free(ovector);
|
|
||||||
FAIL(LN_NOMEM);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- free(ovector);
|
|
||||||
}
|
|
||||||
r = 0; /* success */
|
|
||||||
done:
|
|
||||||
+ pcre2_match_data_free(match_data);
|
|
||||||
return r;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1346,8 +1361,8 @@ void* regex_parser_data_constructor(ln_fieldList_t *node, ln_ctx ctx) {
|
|
||||||
char* name = NULL;
|
|
||||||
struct regex_parser_data_s *pData = NULL;
|
|
||||||
const char *unescaped_exp = NULL;
|
|
||||||
- const char *error = NULL;
|
|
||||||
- int erroffset = 0;
|
|
||||||
+ PCRE2_SIZE erroffset = 0;
|
|
||||||
+ int errcode = 0;
|
|
||||||
|
|
||||||
|
|
||||||
CHKN(name = es_str2cstr(node->name, NULL));
|
|
||||||
@@ -1365,7 +1380,7 @@ void* regex_parser_data_constructor(ln_fieldList_t *node, ln_ctx ctx) {
|
|
||||||
if ((grp_parse_err = regex_parser_configure_consume_and_return_group(args, pData)) != NULL)
|
|
||||||
FAIL(LN_BADCONFIG);
|
|
||||||
|
|
||||||
- CHKN(pData->re = pcre_compile(exp, 0, &error, &erroffset, NULL));
|
|
||||||
+ CHKN(pData->re = pcre2_compile((PCRE2_SPTR)exp, PCRE2_ZERO_TERMINATED, 0, &errcode, &erroffset, NULL));
|
|
||||||
|
|
||||||
pData->max_groups = ((pData->consume_group > pData->return_group) ? pData->consume_group :
|
|
||||||
pData->return_group) + 1;
|
|
||||||
@@ -1387,9 +1402,12 @@ void* regex_parser_data_constructor(ln_fieldList_t *node, ln_ctx ctx) {
|
|
||||||
ln_dbgprintf(ctx, "couldn't allocate memory for regex-string for field: '%s'", name);
|
|
||||||
else if (grp_parse_err != NULL)
|
|
||||||
ln_dbgprintf(ctx, "%s for: '%s'", grp_parse_err, name);
|
|
||||||
- else if (pData->re == NULL)
|
|
||||||
+ else if (pData->re == NULL) {
|
|
||||||
+ PCRE2_UCHAR errbuffer[256];
|
|
||||||
+ pcre2_get_error_message(errcode, errbuffer, sizeof(errbuffer));
|
|
||||||
ln_dbgprintf(ctx, "couldn't compile regex(encountered error '%s' at char '%d' in pattern) "
|
|
||||||
- "for regex-matched field: '%s'", error, erroffset, name);
|
|
||||||
+ "for regex-matched field: '%s'", errbuffer, (int)erroffset, name);
|
|
||||||
+ }
|
|
||||||
regex_parser_data_destructor((void**)&pData);
|
|
||||||
}
|
|
||||||
if (exp != NULL) free(exp);
|
|
||||||
@@ -1401,7 +1419,7 @@ void* regex_parser_data_constructor(ln_fieldList_t *node, ln_ctx ctx) {
|
|
||||||
void regex_parser_data_destructor(void** dataPtr) {
|
|
||||||
if ((*dataPtr) != NULL) {
|
|
||||||
struct regex_parser_data_s *pData = (struct regex_parser_data_s*) *dataPtr;
|
|
||||||
- if (pData->re != NULL) pcre_free(pData->re);
|
|
||||||
+ if (pData->re != NULL) pcre2_code_free(pData->re);
|
|
||||||
free(pData);
|
|
||||||
*dataPtr = NULL;
|
|
||||||
}
|
|
||||||
@ -1,93 +0,0 @@
|
|||||||
Submitted to Adiscon via ticket system. See:
|
|
||||||
|
|
||||||
<https://bugzilla.redhat.com/show_bug.cgi?id=2141801>
|
|
||||||
|
|
||||||
diff --git a/configure b/configure
|
|
||||||
index 759bf0e49cb5d1fa..4b33ab400b380818 100755
|
|
||||||
--- a/configure
|
|
||||||
+++ b/configure
|
|
||||||
@@ -14231,10 +14231,9 @@ fi
|
|
||||||
# Checks for libraries.
|
|
||||||
save_LIBS=$LIBS
|
|
||||||
LIBS=
|
|
||||||
-as_ac_Search=`$as_echo "ac_cv_search_clock_getm4_defn(2.69)" | $as_tr_sh`
|
|
||||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_getm4_defn(2.69)" >&5
|
|
||||||
-$as_echo_n "checking for library containing clock_getm4_defn(2.69)... " >&6; }
|
|
||||||
-if eval \${$as_ac_Search+:} false; then :
|
|
||||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
|
|
||||||
+$as_echo_n "checking for library containing clock_gettime... " >&6; }
|
|
||||||
+if ${ac_cv_search_clock_gettime+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
ac_func_search_save_LIBS=$LIBS
|
|
||||||
@@ -14247,16 +14246,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C"
|
|
||||||
#endif
|
|
||||||
-char clock_getm4_defn(2.69) ();
|
|
||||||
+char clock_gettime ();
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
-return clock_getm4_defn(2.69) ();
|
|
||||||
+return clock_gettime ();
|
|
||||||
;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
-for ac_lib in '' 2.68time; do
|
|
||||||
+for ac_lib in '' rt; do
|
|
||||||
if test -z "$ac_lib"; then
|
|
||||||
ac_res="none required"
|
|
||||||
else
|
|
||||||
@@ -14264,29 +14263,28 @@ for ac_lib in '' 2.68time; do
|
|
||||||
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
|
||||||
fi
|
|
||||||
if ac_fn_c_try_link "$LINENO"; then :
|
|
||||||
- eval "$as_ac_Search=\$ac_res"
|
|
||||||
+ ac_cv_search_clock_gettime=$ac_res
|
|
||||||
fi
|
|
||||||
rm -f core conftest.err conftest.$ac_objext \
|
|
||||||
conftest$ac_exeext
|
|
||||||
- if eval \${$as_ac_Search+:} false; then :
|
|
||||||
+ if ${ac_cv_search_clock_gettime+:} false; then :
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
-if eval \${$as_ac_Search+:} false; then :
|
|
||||||
+if ${ac_cv_search_clock_gettime+:} false; then :
|
|
||||||
|
|
||||||
else
|
|
||||||
- eval "$as_ac_Search=no"
|
|
||||||
+ ac_cv_search_clock_gettime=no
|
|
||||||
fi
|
|
||||||
rm conftest.$ac_ext
|
|
||||||
LIBS=$ac_func_search_save_LIBS
|
|
||||||
fi
|
|
||||||
-eval ac_res=\$$as_ac_Search
|
|
||||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
||||||
-$as_echo "$ac_res" >&6; }
|
|
||||||
-eval ac_res=\$$as_ac_Search
|
|
||||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5
|
|
||||||
+$as_echo "$ac_cv_search_clock_gettime" >&6; }
|
|
||||||
+ac_res=$ac_cv_search_clock_gettime
|
|
||||||
if test "$ac_res" != no; then :
|
|
||||||
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
|
|
||||||
- rt
|
|
||||||
+
|
|
||||||
fi
|
|
||||||
|
|
||||||
LIBS=$save_LIBS
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index aad4993f242291a1..b4f791f7cac47a7d 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -38,7 +38,7 @@ m4_ifdef([AX_IS_RELEASE], [
|
|
||||||
# Checks for libraries.
|
|
||||||
save_LIBS=$LIBS
|
|
||||||
LIBS=
|
|
||||||
-AC_SEARCH_LIBS(clock_getm4_defn([AC_AUTOCONF_VERSION]), [2.68]time, rt)
|
|
||||||
+AC_SEARCH_LIBS(clock_gettime, rt)
|
|
||||||
LIBS=$save_LIBS
|
|
||||||
|
|
||||||
# Checks for header files.
|
|
||||||
Loading…
Reference in new issue