From owner-svn-src-user@FreeBSD.ORG  Sat Oct  1 22:19: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 B86E2106566C;
	Sat,  1 Oct 2011 22:19: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 A7E8F8FC14;
	Sat,  1 Oct 2011 22:19: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 p91MJMNi036064;
	Sat, 1 Oct 2011 22:19:22 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p91MJMVm036062;
	Sat, 1 Oct 2011 22:19:22 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201110012219.p91MJMVm036062@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sat, 1 Oct 2011 22:19: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: r225911 - user/gabor/tre-integration/contrib/tre/lib
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: Sat, 01 Oct 2011 22:19:22 -0000

Author: gabor
Date: Sat Oct  1 22:19:22 2011
New Revision: 225911
URL: http://svn.freebsd.org/changeset/base/225911

Log:
  - Fix pattern handling
  - Add a missing include

Modified:
  user/gabor/tre-integration/contrib/tre/lib/tre-compile.c

Modified: user/gabor/tre-integration/contrib/tre/lib/tre-compile.c
==============================================================================
--- user/gabor/tre-integration/contrib/tre/lib/tre-compile.c	Sat Oct  1 22:17:25 2011	(r225910)
+++ user/gabor/tre-integration/contrib/tre/lib/tre-compile.c	Sat Oct  1 22:19:22 2011	(r225911)
@@ -18,6 +18,7 @@
 #endif /* HAVE_CONFIG_H */
 #include <stdio.h>
 #include <assert.h>
+#include <errno.h>
 #include <regex.h>
 #include <string.h>
 
@@ -1914,7 +1915,7 @@ tre_convert_pattern(const char *regex, s
 #endif /* TRE_MULTIBYTE */
   wregex[wlen] = L'\0';
   *w = wregex;
-  *wn = n;
+  *wn = wlen;
   return REG_OK;
 #else /* !TRE_WCHAR */
   {