From owner-svn-src-user@FreeBSD.ORG  Wed May 11 00:46:22 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 807B61065670;
	Wed, 11 May 2011 00:46:22 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 56A1F8FC0A;
	Wed, 11 May 2011 00:46:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4B0kMnZ066659;
	Wed, 11 May 2011 00:46:22 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4B0kMP9066656;
	Wed, 11 May 2011 00:46:22 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201105110046.p4B0kMP9066656@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 11 May 2011 00:46:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221751 - in user/gabor/tre-integration:
	contrib/tre/lib include
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 May 2011 00:46:22 -0000

Author: gabor
Date: Wed May 11 00:46:22 2011
New Revision: 221751
URL: http://svn.freebsd.org/changeset/base/221751

Log:
  - Implement the BSD-specific REG_STARTEND flag for regexec()

Modified:
  user/gabor/tre-integration/contrib/tre/lib/regexec.c
  user/gabor/tre-integration/include/tre.h

Modified: user/gabor/tre-integration/contrib/tre/lib/regexec.c
==============================================================================
--- user/gabor/tre-integration/contrib/tre/lib/regexec.c	Tue May 10 21:18:45 2011	(r221750)
+++ user/gabor/tre-integration/contrib/tre/lib/regexec.c	Wed May 11 00:46:22 2011	(r221751)
@@ -27,6 +27,7 @@ char *alloca ();
 #endif
 #endif /* TRE_USE_ALLOCA */
 
+#include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
@@ -206,7 +207,28 @@ tre_regnexec(const regex_t *preg, const 
   tre_tnfa_t *tnfa = (void *)preg->TRE_REGEX_T_FIELD;
   tre_str_type_t type = (TRE_MB_CUR_MAX == 1) ? STR_BYTE : STR_MBS;
 
-  return tre_match(tnfa, str, len, type, nmatch, pmatch, eflags);
+  if (eflags & REG_STARTEND)
+  {
+    off_t s_off = pmatch[0].rm_so;
+    off_t e_off = pmatch[0].rm_eo;
+    size_t slen = e_off - s_off;
+    char *sstr = xmalloc(slen);
+    strncpy(sstr, &str[s_off], slen);
+    int ret = tre_match(tnfa, sstr, slen, type, nmatch, pmatch, eflags);
+    if (!(eflags & REG_NOSUB))
+    {
+      for (unsigned i = 0; i < nmatch; i++)
+      {
+	pmatch[i].rm_so += slen;
+        pmatch[i].rm_eo += slen;
+      }
+    }
+    return ret;
+  }
+  else
+  {
+    return tre_match(tnfa, str, len, type, nmatch, pmatch, eflags);
+  }
 }
 
 int

Modified: user/gabor/tre-integration/include/tre.h
==============================================================================
--- user/gabor/tre-integration/include/tre.h	Tue May 10 21:18:45 2011	(r221750)
+++ user/gabor/tre-integration/include/tre.h	Wed May 11 00:46:22 2011	(r221751)
@@ -64,6 +64,7 @@ typedef enum {
 /* POSIX tre_regexec() flags. */
 #define REG_NOTBOL 1
 #define REG_NOTEOL (REG_NOTBOL << 1)
+#define REG_STARTEND (REG_NOTEOL << 1)
 
 /* Extra tre_regexec() flags. */
 #define REG_APPROX_MATCHER	 (REG_NOTEOL << 1)