Date: Tue, 24 Mar 2009 00:44:30 +0000 (UTC) From: "David E. O'Brien" <obrien@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r190351 - stable/7/gnu/usr.bin/grep Message-ID: <200903240044.n2O0iU62026629@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: obrien Date: Tue Mar 24 00:44:30 2009 New Revision: 190351 URL: http://svn.freebsd.org/changeset/base/190351 Log: MFC: r187907: For files not named on the command line, only the basename is compared to the exclude pattern. Modified: stable/7/gnu/usr.bin/grep/savedir.c Modified: stable/7/gnu/usr.bin/grep/savedir.c ============================================================================== --- stable/7/gnu/usr.bin/grep/savedir.c Tue Mar 24 00:43:12 2009 (r190350) +++ stable/7/gnu/usr.bin/grep/savedir.c Tue Mar 24 00:44:30 2009 (r190351) @@ -17,6 +17,9 @@ /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #if HAVE_CONFIG_H # include <config.h> #endif @@ -137,10 +140,10 @@ savedir (const char *dir, off_t name_siz && !isdir1 (dir, dp->d_name)) { if (included_patterns - && !excluded_filename (included_patterns, dp->d_name, 0)) + && !excluded_filename (included_patterns, path, 0)) continue; if (excluded_patterns - && excluded_filename (excluded_patterns, dp->d_name, 0)) + && excluded_filename (excluded_patterns, path, 0)) continue; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903240044.n2O0iU62026629>