From owner-svn-src-user@FreeBSD.ORG  Sat Oct 22 11:42:49 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 04147106564A;
	Sat, 22 Oct 2011 11:42:49 +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 E7EA08FC08;
	Sat, 22 Oct 2011 11:42:48 +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 p9MBgm7h077473;
	Sat, 22 Oct 2011 11:42:48 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9MBgmXr077471;
	Sat, 22 Oct 2011 11:42:48 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201110221142.p9MBgmXr077471@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sat, 22 Oct 2011 11:42:48 +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: r226631 -
	user/gabor/tre-integration/tools/test/regex/sgrep
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, 22 Oct 2011 11:42:49 -0000

Author: gabor
Date: Sat Oct 22 11:42:48 2011
New Revision: 226631
URL: http://svn.freebsd.org/changeset/base/226631

Log:
  - Add a missing break
  - Fix compilation on some platforms
  - Turn off REG_NEWLINE by default

Modified:
  user/gabor/tre-integration/tools/test/regex/sgrep/sgrep.c

Modified: user/gabor/tre-integration/tools/test/regex/sgrep/sgrep.c
==============================================================================
--- user/gabor/tre-integration/tools/test/regex/sgrep/sgrep.c	Sat Oct 22 11:39:17 2011	(r226630)
+++ user/gabor/tre-integration/tools/test/regex/sgrep/sgrep.c	Sat Oct 22 11:42:48 2011	(r226631)
@@ -135,12 +135,12 @@ procfile(const char *path)
 		ret = regexec(&regex, data, 1, &pmatch, eflags);
 		if (ret == REG_NOMATCH)
 			break;
-		printf("(%ld,%ld)", pmatch.rm_so, pmatch.rm_eo);
+		printf("(%lld,%lld)", (long long)pmatch.rm_so, (long long)pmatch.rm_eo);
 		if (pmatch.rm_so == pmatch.rm_eo)
 			pmatch.rm_eo++;
 		st = pmatch.rm_eo;
 	}
-	putchar(')');
+	printf(")\n");
 }
 
 int
@@ -152,7 +152,6 @@ main(int argc, char *argv[])
 
 	setlocale(LC_ALL, "");
 
-	cflags = REG_NEWLINE;
 	eflags = REG_STARTEND;
 
 	while (((c = getopt(argc, argv, "e:EFNr")) != -1))
@@ -161,6 +160,7 @@ main(int argc, char *argv[])
 			pat = strdup(optarg);
 			if (pat == NULL)
 				return (EXIT_FAILURE);
+			break;
 		case 'E':
 			cflags |= REG_EXTENDED;
 			break;