aboutsummaryrefslogtreecommitdiff
path: root/toys/posix
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2019-01-24 18:09:49 -0600
committerRob Landley <rob@landley.net>2019-01-24 18:09:49 -0600
commit49bfa0723dc411a6063822b5e84b2209804bb573 (patch)
tree512fbab9055aea3c8c4daca6f97b1334d0ff678c /toys/posix
parent83b26a20872513120d8b3a2630f8a71707bec0b3 (diff)
downloadtoybox-49bfa0723dc411a6063822b5e84b2209804bb573.tar.gz
grep: "tried" should track arguments (not files) that existed, move -o "" test
into display function, use unsigned length so output lines can be up to 4g each.
Diffstat (limited to 'toys/posix')
-rw-r--r--toys/posix/grep.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/toys/posix/grep.c b/toys/posix/grep.c
index 2cf078b1..42a4c0f1 100644
--- a/toys/posix/grep.c
+++ b/toys/posix/grep.c
@@ -90,8 +90,9 @@ static void numdash(long num, char dash)
// Emit line with various potential prefixes and delimiter
static void outline(char *line, char dash, char *name, long lcount, long bcount,
- int trim)
+ unsigned trim)
{
+ if (!trim && FLAG(o)) return;
if (name && FLAG(H)) printf("%s%s%s%c", TT.purple, name, TT.cyan, dash);
if (FLAG(c)) {
printf("%s%ld", TT.grey, lcount);
@@ -115,7 +116,7 @@ static void do_grep(int fd, char *name)
FILE *file;
int bin = 0;
- TT.tried++;
+ if (!FLAG(r)) TT.tried++;
if (!fd) name = "(standard input)";
// Only run binary file check on lseekable files.
@@ -269,10 +270,6 @@ static void do_grep(int fd, char *name)
fclose(file);
return;
}
- if (FLAG(o))
- if (mm->rm_eo == mm->rm_so)
- break;
-// TODO checking this twice
if (!FLAG(c)) {
long bcount = 1 + offset + (start-line) + (FLAG(o) ? mm->rm_so : 0);
@@ -353,7 +350,7 @@ static void do_grep(int fd, char *name)
if (FLAG(m) && mcount >= TT.m) break;
}
- if (FLAG(c)) outline(0, ':', name, mcount, 0, -1);
+ if (FLAG(c)) outline(0, ':', name, mcount, 0, 1);
// loopfiles will also close the fd, but this frees an (opaque) struct.
fclose(file);
@@ -422,6 +419,7 @@ static int do_grep_r(struct dirtree *new)
{
char *name;
+ if (!new->parent) TT.tried++;
if (!dirtree_notdotdot(new)) return 0;
if (S_ISDIR(new->st.st_mode)) return DIRTREE_RECURSE;
if (TT.S || TT.M) {
@@ -499,5 +497,5 @@ void grep_main(void)
else dirtree_read(*ss, do_grep_r);
}
} else loopfiles_rw(ss, O_RDONLY|WARN_ONLY, 0, do_grep);
- if (TT.tried == toys.optc || (FLAG(q)&&TT.found)) toys.exitval = !TT.found;
+ if (TT.tried >= toys.optc || (FLAG(q)&&TT.found)) toys.exitval = !TT.found;
}