Remove old PCRE code

Author: Mab879

config.h.in

@@ -29,7 +29,6 @@
 #define OSCAP_DEFAULT_CPE_PATH "@OSCAP_DEFAULT_CPE_PATH@"
 #define OSCAP_TEMP_DIR "@OSCAP_TEMP_DIR@"
 
-#cmakedefine HAVE_PCRE2
 
 #cmakedefine HAVE_ATOMIC_BUILTINS
 

src/OVAL/probes/oval_fts.c

@@ -721,7 +721,6 @@ OVAL_FTS *oval_fts_open_prefixed(const char *prefix, SEXP_t *path, SEXP_t *filen
 	ofts->ofts_path_op = path_op;
 	if (regex != NULL) {
 		ofts->ofts_path_regex = regex;
-		oscap_pcre_optimize(regex);
 	}
 
 	if (filesystem == OVAL_RECURSE_FS_LOCAL) {

src/common/oscap_pcre.c

@@ -28,33 +28,24 @@
 
 #define OSCAP_PCRE_EXEC_RECURSION_LIMIT_DEFAULT 3500
 
-#ifdef HAVE_PCRE2
 #define PCRE2_CODE_UNIT_WIDTH 8
 #define PCRE2_ERR_BUF_SIZE 127
 #include <pcre2.h>
-#else
-#include <pcre.h>
-#endif
+
 
 #include "debug_priv.h"
 #include "oscap_pcre.h"
 
 
 struct oscap_pcre {
-#ifdef HAVE_PCRE2
 	pcre2_code_8           *re;
 	pcre2_match_context_8  *re_ctx;
-#else
-	pcre                   *re;
-	struct pcre_extra      *re_extra;
-#endif
 };
 
 
 static inline int _oscap_pcre_opts_to_pcre(oscap_pcre_options_t opts)
 {
 	int res = 0;
-#ifdef HAVE_PCRE2
 	if (opts & OSCAP_PCRE_OPTS_UTF8)
 		res |= PCRE2_UTF;
 	if (opts & OSCAP_PCRE_OPTS_MULTILINE)
@@ -67,27 +58,13 @@ static inline int _oscap_pcre_opts_to_pcre(oscap_pcre_options_t opts)
 		res |= PCRE2_NO_UTF_CHECK;
 	if (opts & OSCAP_PCRE_OPTS_PARTIAL)
 		res |= PCRE2_PARTIAL_SOFT;
-#else
-	if (opts & OSCAP_PCRE_OPTS_UTF8)
-		res |= PCRE_UTF8;
-	if (opts & OSCAP_PCRE_OPTS_MULTILINE)
-		res |= PCRE_MULTILINE;
-	if (opts & OSCAP_PCRE_OPTS_DOTALL)
-		res |= PCRE_DOTALL;
-	if (opts & OSCAP_PCRE_OPTS_CASELESS)
-		res |= PCRE_CASELESS;
-	if (opts & OSCAP_PCRE_OPTS_NO_UTF8_CHECK)
-		res |= PCRE_NO_UTF8_CHECK;
-	if (opts & OSCAP_PCRE_OPTS_PARTIAL)
-		res |= PCRE_PARTIAL;
-#endif
+
 	return res;
 };
 
 static inline oscap_pcre_error_t _pcre_error_to_oscap_pcre(int res)
 {
 	switch (res) {
-#ifdef HAVE_PCRE2
 	case PCRE2_ERROR_NOMATCH:
 		return OSCAP_PCRE_ERR_NOMATCH;
 	case PCRE2_ERROR_PARTIAL:
@@ -116,18 +93,6 @@ static inline oscap_pcre_error_t _pcre_error_to_oscap_pcre(int res)
 		return OSCAP_PCRE_ERR_BADUTF8;
 	case PCRE2_ERROR_RECURSIONLIMIT:
 		return OSCAP_PCRE_ERR_RECURSIONLIMIT;
-#else
-	case PCRE_ERROR_NOMATCH:
-		return OSCAP_PCRE_ERR_NOMATCH;
-	case PCRE_ERROR_PARTIAL:
-		return OSCAP_PCRE_ERR_PARTIAL;
-	case PCRE_ERROR_BADPARTIAL:
-		return OSCAP_PCRE_ERR_BADPARTIAL;
-	case PCRE_ERROR_BADUTF8:
-		return OSCAP_PCRE_ERR_BADUTF8;
-	case PCRE_ERROR_RECURSIONLIMIT:
-		return OSCAP_PCRE_ERR_RECURSIONLIMIT;
-#endif
 	default:
 		dW("Unknown PCRE error code: %d", res);
 		return OSCAP_PCRE_ERR_UNKNOWN;
@@ -138,7 +103,6 @@ oscap_pcre_t *oscap_pcre_compile(const char *pattern, oscap_pcre_options_t optio
                                  char **errptr, int *erroffset)
 {
 	oscap_pcre_t *res = malloc(sizeof(oscap_pcre_t));
-#ifdef HAVE_PCRE2
 	int errno;
 	PCRE2_SIZE erroffset2;
 	res->re_ctx = NULL;
@@ -151,58 +115,27 @@ oscap_pcre_t *oscap_pcre_compile(const char *pattern, oscap_pcre_options_t optio
 		*erroffset = erroffset2;
 		*errptr = strdup((const char*)errmsg);
 	}
-#else
-	res->re_extra = NULL;
-	dD("pcre_compile: patt=%s", pattern);
-	res->re = pcre_compile(pattern, _oscap_pcre_opts_to_pcre(options), (const char **)errptr, erroffset, NULL);
-	if (res->re == NULL)
-		dW("pcre_compile: error (at offset %d): %s", *erroffset, *errptr);
-#endif
+
 	if (res->re == NULL) {
 		free(res);
 		res = NULL;
 	}
 	return res;
 }
 
-void oscap_pcre_optimize(oscap_pcre_t *opcre)
-{
-#ifdef HAVE_PCRE2
-	// This is a NOOP for PCRE2 as all patterns are optimized
-	// unless the library configured differently.
-#else
-	const char *errptr = NULL;
-	pcre_extra *extra = pcre_study(opcre->re, 0, &errptr);
-	if (extra != NULL) {
-		if (opcre->re_extra != NULL)
-			free(opcre->re_extra);
-		opcre->re_extra = extra;
-	}
-#endif
-}
-
 void oscap_pcre_set_match_limit_recursion(oscap_pcre_t *opcre, unsigned long limit)
 {
-#ifdef HAVE_PCRE2
 	if (opcre->re_ctx == NULL) {
 		opcre->re_ctx = pcre2_match_context_create_8(NULL);
 	}
 	pcre2_set_depth_limit_8(opcre->re_ctx, limit);
-#else
-	if (opcre->re_extra == NULL) {
-		opcre->re_extra = calloc(1, sizeof(struct pcre_extra));
-	}
-	opcre->re_extra->match_limit_recursion = limit;
-	opcre->re_extra->flags = PCRE_EXTRA_MATCH_LIMIT_RECURSION;
-#endif
 }
 
 int oscap_pcre_exec(const oscap_pcre_t *opcre, const char *subject,
                     int length, int startoffset, oscap_pcre_options_t options,
                     int *ovector, int ovecsize)
 {
 	int rc = 0;
-#ifdef HAVE_PCRE2
 	// The ovecsize is multiplied by 3 in the code for compatibility with PCRE1
 	int ovecsize2 = ovecsize/3;
 	pcre2_match_data_8 *mdata = pcre2_match_data_create_8(ovecsize2, NULL);
@@ -221,26 +154,16 @@ int oscap_pcre_exec(const oscap_pcre_t *opcre, const char *subject,
 		}
 	}
 	pcre2_match_data_free_8(mdata);
-#else
-	dD("pcre_exec: subj=%s", subject);
-	rc = pcre_exec(opcre->re, opcre->re_extra, subject, length, startoffset, _oscap_pcre_opts_to_pcre(options), ovector, ovecsize);
-	dD("pcre_exec: rc=%d, ", rc);
-#endif
+
 	return rc >= 0 ? rc : _pcre_error_to_oscap_pcre(rc);
 }
 
 void oscap_pcre_free(oscap_pcre_t *opcre)
 {
 	if (opcre != NULL) {
-#ifdef HAVE_PCRE2
 		if (opcre->re_ctx != NULL)
 			pcre2_match_context_free_8(opcre->re_ctx);
 		pcre2_code_free_8(opcre->re);
-#else
-		if (opcre->re_extra != NULL)
-			free(opcre->re_extra);
-		pcre_free(opcre->re);
-#endif
 		free(opcre);
 	}
 }
@@ -318,11 +241,7 @@ int oscap_pcre_get_substrings(char *str, int *ofs, oscap_pcre_t *re, int want_su
 void oscap_pcre_err_free(char *err)
 {
 	if (err != NULL) {
-#ifdef HAVE_PCRE2
 		free(err);
-#else
-		// PCRE1 error messages are static, NOOP.
-#endif
 	}
 }
 

src/common/oscap_pcre.h

@@ -90,12 +90,6 @@ void oscap_pcre_free(oscap_pcre_t *opcre);
  */
 void oscap_pcre_set_match_limit_recursion(oscap_pcre_t *opcre, unsigned long limit);
 
-/**
- * Optimize the compiled regular expression object to increase matching speed.
- * @param opcre the oscap_pcre_t object
- */
-void oscap_pcre_optimize(oscap_pcre_t *opcre);
-
 /**
  * Match a regular expression and return substrings.
  * Caller is responsible for freeing the returned array.