summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Villavicencio <the_paya@gentoo.org>2010-03-28 20:38:10 +0200
committerJim Meyering <meyering@redhat.com>2010-03-28 20:59:30 +0200
commitd0d99971ff63d861d32e83d49eb399c3519a2542 (patch)
treefb1be1d4d5aa032363ec3a3212239935b4e17914
parentda3d9ebff4400a131448b1548bc5e12d8e701ae3 (diff)
downloadgrep-d0d99971ff63d861d32e83d49eb399c3519a2542.tar.gz
grep -r: fix --include with globs, too
The previous fix addressed only the non-glob case. * src/main.c (main): Use add_exclude's EXCLUDE_WILDCARDS option, to enable the use of fnmatch with --include=GLOB. gnulib: Update to latest, for the fixed exclude.c.
m---------gnulib0
-rw-r--r--src/main.c3
2 files changed, 2 insertions, 1 deletions
diff --git a/gnulib b/gnulib
-Subproject 602e3e6b709592f883ebb7bf58df1f955ea4b8f
+Subproject 6207255863f1fb5172ead8b03cda5e4b0b7336a
diff --git a/src/main.c b/src/main.c
index e5bf50f2..fe4e1014 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2066,7 +2066,8 @@ main (int argc, char **argv)
case INCLUDE_OPTION:
if (!included_patterns)
included_patterns = new_exclude ();
- add_exclude (included_patterns, optarg, EXCLUDE_INCLUDE);
+ add_exclude (included_patterns, optarg,
+ EXCLUDE_WILDCARDS | EXCLUDE_INCLUDE);
break;
case GROUP_SEPARATOR_OPTION: