am d262b2a8: am 54bb1d3b: Merge "Fix grep -f."

* commit 'd262b2a886a5674fe428ecbfd3a10dfc5efe8e85':
  Fix grep -f.
This commit is contained in:
Elliott Hughes 2014-03-01 01:20:44 +00:00 committed by Android Git Automerger
commit 1f57081216

View file

@ -294,10 +294,8 @@ read_patterns(const char *fn)
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);