grep: make "-f -" work (+ testsuite)

diff: small code shrink

function                                             old     new   delta
grep_main                                            722     714      -8
diffreg                                             1825    1793     -32
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-40)             Total: -40 bytes
This commit is contained in:
Denis Vlasenko 2008-06-07 05:19:31 +00:00
parent 401de648a7
commit a05c0716c2
3 changed files with 13 additions and 8 deletions

View file

@ -1021,11 +1021,12 @@ static unsigned diffreg(char *file1, char *file2, int flags)
rval = D_SAME;
if (flags & D_EMPTY1)
f1 = xfopen(bb_dev_null, "r");
/* can't be stdin, but xfopen_stdin() is smaller code */
f1 = xfopen_stdin(bb_dev_null);
else
f1 = xfopen_stdin(file1);
if (flags & D_EMPTY2)
f2 = xfopen(bb_dev_null, "r");
f2 = xfopen_stdin(bb_dev_null);
else
f2 = xfopen_stdin(file2);