summaryrefslogtreecommitdiff
path: root/findutils/grep.c
diff options
context:
space:
mode:
authorMark Whitley2000-07-10 15:50:26 +0000
committerMark Whitley2000-07-10 15:50:26 +0000
commit44735f874437ee4b570a6780c1f879de80e80fdc (patch)
tree468f03558df985a32c0631338c7a64c5919da92b /findutils/grep.c
parent999bf72f49a501e47448010c4ddb06dc03ed1612 (diff)
downloadbusybox-44735f874437ee4b570a6780c1f879de80e80fdc.zip
busybox-44735f874437ee4b570a6780c1f879de80e80fdc.tar.gz
Applied patch from Matt Kraai as per his email:
However, the case of grep foo$ file didn't work, due to a problem with the flags used in regular expression compilation. The attached patch fixes this problem. ---patch------- Index: grep.c =================================================================== RCS file: /var/cvs/busybox/grep.c,v retrieving revision 1.30 diff -u -r1.30 grep.c --- grep.c 2000/07/04 22:17:01 1.30 +++ grep.c 2000/07/10 08:57:04 @@ -141,8 +141,10 @@ if (argv[optind] == NULL) usage(grep_usage); - /* compile the regular expression */ - reflags = REG_NOSUB; /* we're not going to mess with sub-expressions */ + /* compile the regular expression + * we're not going to mess with sub-expressions, and we need to + * treat newlines right. */ + reflags = REG_NOSUB | REG_NEWLINE; if (ignore_case) reflags |= REG_ICASE; if ((ret = regcomp(&regex, argv[optind], reflags)) != 0) { ---patch------- Thanks, Matt, it works great.
Diffstat (limited to 'findutils/grep.c')
-rw-r--r--findutils/grep.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/findutils/grep.c b/findutils/grep.c
index 05bf8b8..8d2c915 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -141,8 +141,10 @@ extern int grep_main(int argc, char **argv)
if (argv[optind] == NULL)
usage(grep_usage);
- /* compile the regular expression */
- reflags = REG_NOSUB; /* we're not going to mess with sub-expressions */
+ /* compile the regular expression
+ * we're not going to mess with sub-expressions, and we need to
+ * treat newlines right. */
+ reflags = REG_NOSUB | REG_NEWLINE;
if (ignore_case)
reflags |= REG_ICASE;
if ((ret = regcomp(&regex, argv[optind], reflags)) != 0) {