From owner-svn-src-user@FreeBSD.ORG Thu Oct 20 09:53:20 2011 Return-Path: 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 6D943106564A; Thu, 20 Oct 2011 09:53:20 +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 5CFB78FC0A; Thu, 20 Oct 2011 09:53:20 +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 p9K9rKh4067126; Thu, 20 Oct 2011 09:53:20 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9K9rKcT067124; Thu, 20 Oct 2011 09:53:20 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201110200953.p9K9rKcT067124@svn.freebsd.org> From: Gabor Kovesdan Date: Thu, 20 Oct 2011 09:53:20 +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: r226561 - 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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Oct 2011 09:53:20 -0000 Author: gabor Date: Thu Oct 20 09:53:20 2011 New Revision: 226561 URL: http://svn.freebsd.org/changeset/base/226561 Log: - Add -N for REG_NEWLINE - style(9) 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 Thu Oct 20 09:46:47 2011 (r226560) +++ user/gabor/tre-integration/tools/test/regex/sgrep/sgrep.c Thu Oct 20 09:53:20 2011 (r226561) @@ -100,11 +100,8 @@ grep_tree(char **argv) while ((p = fts_read(fts)) != NULL) switch (p->fts_info) { case FTS_DNR: - /* FALLTHROUGH */ case FTS_ERR: - /* FALLTHROUGH */ case FTS_D: - /* FALLTHROUGH */ case FTS_DP: /* FALLTHROUGH */ case FTS_DC: @@ -158,7 +155,7 @@ main(int argc, char *argv[]) cflags = REG_NEWLINE; eflags = REG_STARTEND; - while (((c = getopt(argc, argv, "e:EFr")) != -1)) + while (((c = getopt(argc, argv, "e:EFNr")) != -1)) switch (c) { case 'e': pat = strdup(optarg); @@ -170,6 +167,9 @@ main(int argc, char *argv[]) case 'F': cflags |= REG_NOSPEC; break; + case 'N': + cflags |= REG_NEWLINE; + break; case 'r': dir = true; }