From owner-p4-projects@FreeBSD.ORG Tue Jul 8 18:58:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B7611065674; Tue, 8 Jul 2008 18:58:04 +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 4F4421065672 for ; Tue, 8 Jul 2008 18:58:04 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3DDCB8FC28 for ; Tue, 8 Jul 2008 18:58:04 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m68Iw4Ut002371 for ; Tue, 8 Jul 2008 18:58:04 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m68Iw49l002369 for perforce@freebsd.org; Tue, 8 Jul 2008 18:58:04 GMT (envelope-from gabor@freebsd.org) Date: Tue, 8 Jul 2008 18:58:04 GMT Message-Id: <200807081858.m68Iw49l002369@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144904 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jul 2008 18:58:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=144904 Change 144904 by gabor@gabor_server on 2008/07/08 18:57:23 - Change --exclude and --include to use fnmatch() for GNU compatibility Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#61 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#52 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#61 (text+ko) ==== @@ -88,7 +88,6 @@ /* Filename exclusion/inclusion patterns */ int epatterns, epattern_sz; char **epattern; -regex_t *er_pattern; /* For regex errors */ char re_error[RE_ERROR_BUF + 1]; @@ -258,10 +257,8 @@ } if (len > 0 && pat[len - 1] == '\n') --len; - /* pat may not be NUL-terminated */ epattern[epatterns] = grep_malloc(len + 1); memcpy(epattern[epatterns], pat, len); - epattern[epatterns][len] = '\0'; ++epatterns; } @@ -568,15 +565,6 @@ errx(2, "%s", re_error); } } - er_pattern = grep_calloc(epatterns, sizeof(*er_pattern)); - for (i = 0; i < epatterns; ++i) { - c = regcomp(&er_pattern[i], epattern[i], REG_EXTENDED); - if (c != 0) { - regerror(c, &er_pattern[i], re_error, - RE_ERROR_BUF); - errx(2, "%s", re_error); - } - } if (lbflag) setlinebuf(stdout); ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#52 (text+ko) ==== @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -93,23 +94,16 @@ break; default: if (exclflag) { - regmatch_t pmatch; - ok = 1; - pmatch.rm_so = 0; - pmatch.rm_eo = strlen(p->fts_path); - for (i = 0; i < epatterns; i++) - if (regexec(&er_pattern[i], p->fts_path, 0, &pmatch, eflags) == 0) { + for (i = 0; i < epatterns; ++i) + if (fnmatch(epattern[i], p->fts_path, 0) == 0) { ok = 0; break; } } else if (inclflag) { - regmatch_t pmatch; ok = 0; - pmatch.rm_so = 0; - pmatch.rm_eo = strlen(p->fts_path); for (i = 0; i < epatterns; i++) - if (regexec(&er_pattern[i], p->fts_path, 0, &pmatch, eflags) == 0) { + if (fnmatch(epattern[i], p->fts_path, 0) == 0) { ok = 1; break; }