Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nginx-util: move to pcre2

Browse source 
Convert to pcre2 library as pcre is EOL. No functional change intended.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2023-09-22 18:15:01 +02:00 committed by Rosen Penev
parent 5c1bcb6133
commit b738e42c4d
3 changed files with 34 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/nginx-util/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=nginx-util
PKG_VERSION:=1.6
PKG_RELEASE:=19
PKG_RELEASE:=20
PKG_MAINTAINER:=Peter Stadler <peter.stadler@student.uibk.ac.at>
include $(INCLUDE_DIR)/package.mk
@ -30,7 +30,7 @@ endef
define Package/nginx-ssl-util
$(Package/nginx-ssl-util/default)
TITLE+= (using PCRE)
DEPENDS+= +libpcre
DEPENDS+= +libpcre2
CONFLICTS:=nginx-ssl-util-nopcre,
endef

4
net/nginx-util/src/CMakeLists.txt
View file

@ -27,7 +27,7 @@ FIND_LIBRARY(ubus NAMES ubus)
INCLUDE_DIRECTORIES(${ubus_include_dir})
ADD_EXECUTABLE(nginx-ssl-util nginx-util.cpp)
TARGET_LINK_LIBRARIES(nginx-ssl-util ${uci} ${ubox} ${ubus} pthread ssl crypto pcre)
TARGET_LINK_LIBRARIES(nginx-ssl-util ${uci} ${ubox} ${ubus} pthread ssl crypto pcre2-8)
INSTALL(TARGETS nginx-ssl-util RUNTIME DESTINATION bin)
ADD_EXECUTABLE(nginx-ssl-util-nopcre nginx-util.cpp)
@ -51,7 +51,7 @@ INSTALL(TARGETS px5g RUNTIME DESTINATION bin)
ADD_EXECUTABLE(nginx-ssl-util-noubus nginx-util.cpp)
TARGET_COMPILE_DEFINITIONS(nginx-ssl-util-noubus PUBLIC -DNO_UBUS)
TARGET_LINK_LIBRARIES(nginx-ssl-util-noubus ${uci} ${ubox} pthread ssl crypto pcre)
TARGET_LINK_LIBRARIES(nginx-ssl-util-noubus ${uci} ${ubox} pthread ssl crypto pcre2-8)
INSTALL(TARGETS nginx-ssl-util-noubus RUNTIME DESTINATION bin)
ADD_EXECUTABLE(nginx-ssl-util-nopcre-noubus nginx-util.cpp)

42
net/nginx-util/src/regex-pcre.hpp
View file

@ -1,7 +1,9 @@
#ifndef __REGEXP_PCRE_HPP
#define __REGEXP_PCRE_HPP
#include <pcre.h>
#define PCRE2_CODE_UNIT_WIDTH 8
#include <pcre2.h>
#include <array>
#include <stdexcept>
#include <string>
@ -65,11 +67,9 @@ class regex {
private:
int errcode = 0;
const char* errptr = nullptr;
PCRE2_SIZE erroffset = 0;
int erroffset = 0;
pcre* const re = nullptr;
pcre2_code* const re = nullptr;
static const std::array<regex_constants::error_type, 86> errcode_pcre2regex;
@ -89,10 +89,18 @@ class regex {
explicit regex(const std::string& str) : regex(str.c_str()) {}
explicit regex(const char* const str)
: re{pcre_compile2(str, 0, &errcode, &errptr, &erroffset, nullptr)}
: re{pcre2_compile((PCRE2_SPTR)str, PCRE2_ZERO_TERMINATED, 0, &errcode, &erroffset, nullptr)}
{
if (re == nullptr) {
std::string what = std::string("regex error: ") + errptr + '\n';
std::vector<PCRE2_UCHAR> buffer(256);
int errlen;
errlen = pcre2_get_error_message(errcode, buffer.data(), buffer.size());
if (errlen < 0)
throw regex_error(errcode_pcre2regex.at(errlen));
std::string what = std::string("regex error: ") +
std::string(buffer.data(), buffer.data() + errlen) + '\n';
what += " '" + std::string{str} + "'\n";
what += " " + std::string(erroffset, ' ') + '^';
@ -103,11 +111,11 @@ class regex {
~regex()
{
if (re != nullptr) {
pcre_free(re);
pcre2_code_free(re);
}
}
inline auto operator()() const -> const pcre*
inline auto operator()() const -> const pcre2_code*
{
return re;
}
@ -187,11 +195,19 @@ auto regex_search(std::string::const_iterator begin,
inline auto regex_search(const std::string& subj, const regex& rgx)
{
pcre2_match_data *match_data;
if (rgx() == nullptr) {
throw std::runtime_error("regex_search error: no regex given");
}
match_data = pcre2_match_data_create_from_pattern(rgx(), NULL);
int n =
pcre_exec(rgx(), nullptr, subj.c_str(), static_cast<int>(subj.length()), 0, 0, nullptr, 0);
pcre2_match(rgx(), (PCRE2_SPTR)subj.c_str(), static_cast<int>(subj.length()), 0, 0, match_data, nullptr);
pcre2_match_data_free(match_data);
return n >= 0;
}
@ -205,7 +221,7 @@ auto regex_search(const std::string::const_iterator begin,
}
int sz = 0;
pcre_fullinfo(rgx(), nullptr, PCRE_INFO_CAPTURECOUNT, &sz);
pcre2_pattern_info(rgx(), PCRE2_INFO_CAPTURECOUNT, &sz);
sz = 3 * (sz + 1);
match.vec.reserve(sz);
@ -216,7 +232,9 @@ auto regex_search(const std::string::const_iterator begin,
match.begin = begin;
match.end = end;
match.n = pcre_exec(rgx(), nullptr, subj, len, 0, 0, &match.vec[0], sz);
pcre2_match_data *match_data = pcre2_match_data_create(sz, NULL);
match.n = pcre2_match(rgx(), (PCRE2_SPTR)subj, len, 0, 0, match_data, NULL);
pcre2_match_data_free(match_data);
if (match.n < 0) {
return false;