From owner-svn-src-user@FreeBSD.ORG  Thu Sep 15 15:18:58 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 522CA106566B;
	Thu, 15 Sep 2011 15:18:58 +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 288968FC08;
	Thu, 15 Sep 2011 15:18:58 +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 p8FFIwte078930;
	Thu, 15 Sep 2011 15:18:58 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8FFIwsN078927;
	Thu, 15 Sep 2011 15:18:58 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201109151518.p8FFIwsN078927@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 15 Sep 2011 15:18:58 +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: r225590 - 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: Thu, 15 Sep 2011 15:18:58 -0000

Author: gabor
Date: Thu Sep 15 15:18:57 2011
New Revision: 225590
URL: http://svn.freebsd.org/changeset/base/225590

Log:
  - Simplify REG_PEND code and add support for the same in wchar-compliant
    regcomp() variants

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

Modified: user/gabor/tre-integration/contrib/tre/lib/regcomp.c
==============================================================================
--- user/gabor/tre-integration/contrib/tre/lib/regcomp.c	Thu Sep 15 15:12:18 2011	(r225589)
+++ user/gabor/tre-integration/contrib/tre/lib/regcomp.c	Thu Sep 15 15:18:57 2011	(r225590)
@@ -112,16 +112,8 @@ tre_regncomp(regex_t *preg, const char *
 int
 tre_regcomp(regex_t *preg, const char *regex, int cflags)
 {
-  size_t len;
-
-  if (cflags & REG_PEND)
-    {
-      if (preg->re_endp >= regex)
-	len = preg->re_endp - regex;
-      else
-	len = regex ? strlen(regex) : 0;
-      return tre_regncomp(preg, regex, len, cflags);
-   }
+  if ((cflags & REG_PEND) && (preg->re_endp >= regex))
+    return tre_regncomp(preg, regex, preg->re_endp - regex, cflags);
   else
     return tre_regncomp(preg, regex, regex ? strlen(regex) : 0, cflags);
 }
@@ -137,6 +129,9 @@ tre_regwncomp(regex_t *preg, const wchar
 int
 tre_regwcomp(regex_t *preg, const wchar_t *regex, int cflags)
 {
+  if ((cflags & REG_PEND) && (preg->re_wendp >= regex))
+    return tre_compile(preg, regex, preg->re_wendp - regex, cflags);
+  else
     return tre_compile(preg, regex, regex ? wcslen(regex) : 0, cflags);
 }
 #endif /* TRE_WCHAR */

Modified: user/gabor/tre-integration/include/regex.h
==============================================================================
--- user/gabor/tre-integration/include/regex.h	Thu Sep 15 15:12:18 2011	(r225589)
+++ user/gabor/tre-integration/include/regex.h	Thu Sep 15 15:18:57 2011	(r225590)
@@ -69,6 +69,9 @@ typedef struct {
   void *shortcut;  /* For internal use only. */
   void *heur;	   /* For internal use only. */
   const char *re_endp;
+#ifdef TRE_WCHAR
+  const wchar_t *re_wendp;
+#endif
 } regex_t;
 
 typedef struct {