1 files changed, 38 insertions, 23 deletions

diff --git a/regex.c b/regex.c
index 834d97b574..ea08cb5ede 100644
--- a/regex.c
+++ b/regex.c
@@ -2922,35 +2922,15 @@ re_compile_fastmap(bufp)
   FREE_AND_RETURN_VOID(stackb);
 }
 
-
-/* Using the compiled pattern in BUFP->buffer, first tries to match
-   STRING, starting first at index STARTPOS, then at STARTPOS + 1, and
-   so on.  RANGE is the number of places to try before giving up.  If
-   RANGE is negative, it searches backwards, i.e., the starting
-   positions tried are STARTPOS, STARTPOS - 1, etc.  STRING is of SIZE.
-   In REGS, return the indices of STRING that matched the entire
-   BUFP->buffer and its contained subexpressions.
-
-   The value returned is the position in the strings at which the match
-   was found, or -1 if no match was found, or -2 if error (such as
-   failure stack overflow).  */
-
+/* adjust startpos value to the position between characters. */
 int
-re_search(bufp, string, size, startpos, range, regs)
+re_adjust_startpos(bufp, string, size, startpos, range)
      struct re_pattern_buffer *bufp;
      const char *string;
      int size, startpos, range;
-     struct re_registers *regs;
 {
-  register char *fastmap = bufp->fastmap;
-  int val, anchor = 0;
-
-  /* Check for out-of-range starting position.  */
-  if (startpos < 0  ||  startpos > size)
-    return -1;
-
   /* Update the fastmap now if not correct already.  */
-  if (fastmap && !bufp->fastmap_accurate) {
+  if (!bufp->fastmap_accurate) {
     re_compile_fastmap(bufp);
   }
 
@@ -2980,6 +2960,41 @@ re_search(bufp, string, size, startpos, range, regs)
       }
     }
   }
+  return startpos;
+}
+
+
+/* Using the compiled pattern in BUFP->buffer, first tries to match
+   STRING, starting first at index STARTPOS, then at STARTPOS + 1, and
+   so on.  RANGE is the number of places to try before giving up.  If
+   RANGE is negative, it searches backwards, i.e., the starting
+   positions tried are STARTPOS, STARTPOS - 1, etc.  STRING is of SIZE.
+   In REGS, return the indices of STRING that matched the entire
+   BUFP->buffer and its contained subexpressions.
+
+   The value returned is the position in the strings at which the match
+   was found, or -1 if no match was found, or -2 if error (such as
+   failure stack overflow).  */
+
+int
+re_search(bufp, string, size, startpos, range, regs)
+     struct re_pattern_buffer *bufp;
+     const char *string;
+     int size, startpos, range;
+     struct re_registers *regs;
+{
+  register char *fastmap = bufp->fastmap;
+  int val, anchor = 0;
+
+  /* Check for out-of-range starting position.  */
+  if (startpos < 0  ||  startpos > size)
+    return -1;
+
+  /* Update the fastmap now if not correct already.  */
+  if (fastmap && !bufp->fastmap_accurate) {
+    re_compile_fastmap(bufp);
+  }
+
 
   /* If the search isn't to be a backwards one, don't waste time in a
      search for a pattern that must be anchored.  */