From 94d5ea5f6b6fea693d1c4a2ed3e81abd10220fe5 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sat, 11 May 2019 06:23:30 +0000
Subject:  Accept empty regexes even on BSDs

---
 src/fdholder/s6-fdholderd.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/fdholder/s6-fdholderd.c')

diff --git a/src/fdholder/s6-fdholderd.c b/src/fdholder/s6-fdholderd.c
index 2f4c2b4..86a957a 100644
--- a/src/fdholder/s6-fdholderd.c
+++ b/src/fdholder/s6-fdholderd.c
@@ -11,6 +11,7 @@
 #include <signal.h>
 #include <regex.h>
 
+#include <skalibs/posixplz.h>
 #include <skalibs/posixishard.h>
 #include <skalibs/types.h>
 #include <skalibs/allreadwrite.h>
@@ -528,7 +529,7 @@ static int makere (regex_t *re, char const *s, char const *var)
   size_t varlen = strlen(var) ;
   if (str_start(s, var) && (s[varlen] == '='))
   {
-    int r = regcomp(re, s + varlen + 1, REG_EXTENDED | REG_NOSUB) ;
+    int r = skalibs_regcomp(re, s + varlen + 1, REG_EXTENDED | REG_NOSUB) ;
     if (r)
     {
       if (verbosity)
@@ -546,7 +547,7 @@ static int makere (regex_t *re, char const *s, char const *var)
 
 static void defaultre (regex_t *re)
 {
-  int r = regcomp(re, ".^", REG_EXTENDED | REG_NOSUB) ;
+  int r = skalibs_regcomp(re, ".^", REG_EXTENDED | REG_NOSUB) ;
   if (r)
   {
     char buf[256] ;
-- 
cgit v1.2.3