From owner-p4-projects@FreeBSD.ORG Fri Jul 9 17:58:57 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FC7E1065673; Fri, 9 Jul 2010 17:58:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2495C1065670 for ; Fri, 9 Jul 2010 17:58:57 +0000 (UTC) (envelope-from bfiedler@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 124718FC0C for ; Fri, 9 Jul 2010 17:58:57 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o69HwuGw086275 for ; Fri, 9 Jul 2010 17:58:56 GMT (envelope-from bfiedler@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o69Hwu41086273 for perforce@freebsd.org; Fri, 9 Jul 2010 17:58:56 GMT (envelope-from bfiedler@FreeBSD.org) Date: Fri, 9 Jul 2010 17:58:56 GMT Message-Id: <201007091758.o69Hwu41086273@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bfiedler@FreeBSD.org using -f From: Benjamin Fiedler To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180697 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Jul 2010 17:58:57 -0000 http://p4web.freebsd.org/@@180697?ac=10 Change 180697 by bfiedler@freebsd-7803 on 2010/07/09 17:58:31 These options are already supported as long as the regex is compiled with flag | REG_EXTENDED Affected files ... .. //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.c#11 edit Differences ... ==== //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.c#11 (text+ko) ==== @@ -156,27 +156,6 @@ { NULL, 0, NULL, '\0'} }; -/* - * allow for grep-style regex's by substituting regex equivalent -*/ -static struct { - char *orig; - char *sub; -} const grep_regex[] = { - { "[:alpha:]", "" }, - { "[:upper:]", "" }, - { "[:lower:]", "" }, - { "[:digit:]", "" }, - { "[:xdigit:]", "" }, - { "[:space:]", "" }, - { "[:punct:]", "" }, - { "[:alnum:]", "" }, - { "[:print:]", "" }, - { "[:graph:]", "" }, - { "[:cntrl:]", "" }, - { "[:blank:]", "" }, - { NULL, NULL }, -}; static const char *help_msg[] = { @@ -439,16 +418,6 @@ compile_regex(&ignore_re, ignore_pats); } if ( fnline_pat != NULL) { - char *expand; - expand = estrdup(fnline_pat); - fnline_pat = expand; - int i; - for( i = 0; grep_regex[i].orig; i++) - { - fnline_pat = repstr(fnline_pat, grep_regex[i].orig, - grep_regex[i].sub); - } - compile_regex(&fnline_re, fnline_pat); }