From owner-svn-src-user@FreeBSD.ORG  Sun Feb 26 19:01:00 2012
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 4C623106566B;
	Sun, 26 Feb 2012 19:01:00 +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 37FC28FC13;
	Sun, 26 Feb 2012 19:01:00 +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 q1QJ104f078696;
	Sun, 26 Feb 2012 19:01:00 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1QJ10E5078694;
	Sun, 26 Feb 2012 19:01:00 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201202261901.q1QJ10E5078694@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 26 Feb 2012 19:01:00 +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: r232190 - 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: Sun, 26 Feb 2012 19:01:00 -0000

Author: gabor
Date: Sun Feb 26 19:00:59 2012
New Revision: 232190
URL: http://svn.freebsd.org/changeset/base/232190

Log:
  - Only set offset when REG_NOSUB was not specified and nmatch is greater
    then 0.

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

Modified: user/gabor/tre-integration/contrib/tre/lib/mregexec.c
==============================================================================
--- user/gabor/tre-integration/contrib/tre/lib/mregexec.c	Sun Feb 26 18:54:45 2012	(r232189)
+++ user/gabor/tre-integration/contrib/tre/lib/mregexec.c	Sun Feb 26 19:00:59 2012	(r232190)
@@ -263,12 +263,13 @@ finish2:
 			  pm, eflags);
 	  if ((ret == REG_OK) && (pm[0].rm_so == 0))
 	    {
-	      for (int i = 0; i < nmatch; i++)
-		{
-		  pm[i].rm_so += st;
-		  pm[i].rm_eo += st;
-		  pm[i].p = rpm.p;
-		}
+	      if (need_offsets)
+		for (int i = 0; i < nmatch; i++)
+		  {
+		    pm[i].rm_so += st;
+		    pm[i].rm_eo += st;
+		    pm[i].p = rpm.p;
+		  }
 	      goto finish3;
 	    }
 	  else if ((ret != REG_NOMATCH) || (ret != REG_OK))