| commit | d262b2a886a5674fe428ecbfd3a10dfc5efe8e85 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Sat Mar 01 01:17:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 01 01:17:11 2014 +0000 |
| tree | ddbcf2581de1220ee5b32171b95e06d1d33a3f58 | |
| parent | ab41b68968e133bd625ee24e45b2582067ca00be [diff] | |
| parent | 54bb1d3b98075316e0cd1289f218470cb70227ce [diff] |
am 54bb1d3b: Merge "Fix grep -f." * commit '54bb1d3b98075316e0cd1289f218470cb70227ce': Fix grep -f.
diff --git a/toolbox/grep/grep.c b/toolbox/grep/grep.c index b5bb2ef..5a4fa0c 100644 --- a/toolbox/grep/grep.c +++ b/toolbox/grep/grep.c
@@ -294,10 +294,8 @@ err(2, "%s", fn); line = NULL; len = 0; -#ifndef ANDROID while ((rlen = getline(&line, &len, f)) != -1) add_pattern(line, *line == '\n' ? 0 : (size_t)rlen); -#endif free(line); if (ferror(f)) err(2, "%s", fn);