RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:07:35 +00:00
Code Issues Activity Actions

grep: Exit with 1 if nothing matches

Browse source
This commit is contained in:
AnotherTest 2021-02-11 21:55:58 +03:30 • committed by Andreas Kling
parent 9b69c73dfe
commit 6f9e6e63b6
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Userland/Utilities/grep.cpp
View file

@ -188,6 +188,7 @@ int main(int argc, char** argv)
} }
}; };
bool did_match_something = false;
if (!files.size() && !recursive) { if (!files.size() && !recursive) {
char* line = nullptr; char* line = nullptr;
size_t line_len = 0; size_t line_len = 0;
@ -201,7 +202,9 @@ int main(int argc, char** argv)
if (is_binary && binary_mode == BinaryFileMode::Skip) if (is_binary && binary_mode == BinaryFileMode::Skip)
return 1; return 1;
if (matches(line_view, "stdin", false, is_binary) && is_binary && binary_mode == BinaryFileMode::Binary) auto matched = matches(line_view, "stdin", false, is_binary);
did_match_something = did_match_something || matched;
if (matched && is_binary && binary_mode == BinaryFileMode::Binary)
return 0; return 0;
} }
} else { } else {
@ -217,5 +220,5 @@ int main(int argc, char** argv)
} }
} }
return 0; return did_match_something ? 0 : 1;
} }