| commit | 1f57081216a2eae81672dadd67c94476b27fbf63 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Sat Mar 01 01:20:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 01 01:20:44 2014 +0000 |
| tree | d3aef3dd13d3088a62a449d41cb899a6b6fc5c54 | |
| parent | 53a3b3f56ab53da0e657a8fa670f8f30b80bb4c9 [diff] | |
| parent | d262b2a886a5674fe428ecbfd3a10dfc5efe8e85 [diff] |
am d262b2a8: am 54bb1d3b: Merge "Fix grep -f." * commit 'd262b2a886a5674fe428ecbfd3a10dfc5efe8e85': 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);