Changeset 588 for trunk/src/sh_log_parse_generic.c

Timestamp:

Oct 26, 2025, 12:17:47 PM (16 hours ago)

Author:

katerina

Message:

Fix for ticket #476 (move logfile monitoring module from PCRE to PCRE2).

File:

• trunk/src/sh_log_parse_generic.c (modified) (2 diffs)

trunk/src/sh_log_parse_generic.c

@@ -22 +22 @@
 #include <time.h>
 
-/* Debian/Ubuntu: libpcre3-dev */
-#ifdef HAVE_PCRE_PCRE_H
-#include <pcre/pcre.h>
+/* Debian/Ubuntu: libpcre2-dev */
+#define PCRE2_CODE_UNIT_WIDTH 8
+#ifdef HAVE_PCRE2_PCRE2_H
+#include <pcre2/pcre2.h>
 #else
-#include <pcre.h>
+#include <pcre2.h>
 #endif
 
@@ -34 +35 @@
 
 struct sh_fileinfo_generic {
-  pcre * line_regex;
-  int  * line_ovector;         /* captured substrings     */
-  int    line_ovecnum;         /* how many captured       */
+  pcre2_code        * line_regex;
+  pcre2_match_data  * line_match_data;      /* captured substrings     */
+  int                 line_ovecnum;         /* how many captured       */
   
   int    pos_host;