| commit | 54bb1d3b98075316e0cd1289f218470cb70227ce | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Sat Mar 01 01:12:49 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Sat Mar 01 01:12:49 2014 +0000 |
| tree | 538d5b49b366cf6124e6aecee2f12585231c6fcc | |
| parent | 1a1c42fda7ec6087355529337573dd3ec5e85d91 [diff] | |
| parent | 4014501d79d060f0855b919ee20fa9db5448cfdf [diff] |
Merge "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);