Changeset 250

Timestamp:

Aug 22, 2002, 10:36:25 AM (17 years ago)

Author:

jkh

Message:

Make this work with Henry Spencer's new regex API

File:

• trunk/base/src/pextlib1.0/strsed.c (modified) (14 diffs)

trunk/base/src/pextlib1.0/strsed.c

@@ -32 +32 @@
 /*
  * $Log: strsed.c,v $
+ * Revision 1.3  2002/08/22 10:36:25  jkh
+ * Make this work with Henry Spencer's new regex API
+ *
  * Revision 1.2  2002/08/21 05:22:12  landonf
  * Merge in "bigmove" reorg branch. System now requires bsdmake && bsdmake install
@@ -149 +152 @@
 
 #ifdef HS_REGEX
-#include <regexp.h>
+#include <sys/types.h>
+#include <regex.h>
 #endif
 
@@ -239 +243 @@
 
 #ifdef HS_REGEX
-    static regexp empty_exp;
-    static regexp *exp;
+    static regmatch_t exp_regs[100];
+    static regex_t exp;
 #endif
 
@@ -290 +294 @@
         /* We use first_time again if we are GNU_REGEX, and reset it later. */
         first_time = 0;
-        
-        /* Zero the fake regexp that we use if the regex is ".*" */
-        for (i = 0; i < NSUBEXP; i++){
-            empty_exp.startp[i] = empty_exp.endp[i] = EMPTY_REGISTER;
-        } 
+
+        for (i = 0; i < 100; i++)
+                exp_regs[i].rm_so = exp_regs[i].rm_eo = 0;
 #endif
     }
@@ -541 +543 @@
         regs = empty_regs;
 #endif
-#ifdef HS_REGEX
-        exp = &empty_exp;
-#endif
     }
 
@@ -587 +586 @@
 
 #ifdef HS_REGEX
-        if ((exp = regcomp(from)) == (regexp *)0){
+        if (regcomp(&exp, from, 0) != 0){
             RETURN(0);
         }
@@ -605 +604 @@
             regs.end[0] = str_len;
 #endif
-#ifdef HS_REGEX
-            exp->startp[0] = str;
-            exp->endp[0] = str + str_len;
-#endif
         }
         else{
@@ -615 +610 @@
 #endif
 #ifdef HS_REGEX
-            match = regexec(exp, str);
+            match = regexec(&exp, str, strlen(str), exp_regs, 0) ? NO_MATCH : 1;
 #endif
         }
@@ -629 +624 @@
 #endif
 #ifdef HS_REGEX
-            range[0] = match == NO_MATCH ? -1 : (int)(exp->startp[0] - str);
-            range[1] = match == NO_MATCH ? -1 : (int)(exp->endp[0] - str);
+            range[0] = match == NO_MATCH ? -1 : exp_regs[0].rm_so;
+            range[1] = match == NO_MATCH ? -1 : exp_regs[0].rm_eo;
 #endif
             RETURN(str);
@@ -646 +641 @@
 #endif
 #ifdef HS_REGEX
-            range[0] = (int)(exp->startp[0] - str);
-            range[1] = (int)(exp->endp[0] - str);
+            range[0] = exp_regs[0].rm_so;
+            range[1] = exp_regs[0].rm_eo;
 #endif
             }
@@ -661 +656 @@
 #endif
 #ifdef HS_REGEX
-            need = (int)(exp->startp[0] - str);
+            need = exp_regs[0].rm_so;
 #endif
 
@@ -688 +683 @@
 #endif
 #ifdef HS_REGEX
-                    need = (int)(exp->endp[reg] - exp->startp[reg]);
+                    need = exp_regs[reg].rm_eo - exp_regs[reg].rm_so;
 #endif
 
@@ -724 +719 @@
 
 #ifdef HS_REGEX
-                    if (exp->startp[reg] != EMPTY_REGISTER){
+                    if (exp_regs[0].rm_so != EMPTY_REGISTER){
                         register char *s;
-                        for (s = exp->startp[reg]; s < exp->endp[reg]; s++){
+                        for (s = exp_regs[0].rm_so; s < exp_regs[0].rm_eo; s++){
                             new_str[new_pos++] = translit ? map[*s] : *s;
                         }
@@ -748 +743 @@
 #endif
 #ifdef HS_REGEX
-            str = exp->endp[0];
-            str_len -= (int)(exp->endp[0] - exp->startp[0]);
+            str += exp_regs[0].rm_eo;
+            str_len -= (int)(exp_regs[0].rm_eo - exp_regs[0].rm_so);
 #endif
         }