beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 00:31:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Utilities: Add option to control when to use colored output for grep

Browse source 
Fixes #9351.
This commit is contained in:
TheFightingCatfish 2021-08-12 19:12:38 +08:00 committed by Andreas Kling
parent 072961090f
commit fdde19d616
Notes: sideshowbarker 2024-07-18 07:05:10 +09:00 
Author: https://github.com/SeekingBlues
Commit: https://github.com/SerenityOS/serenity/commit/fdde19d616c
Pull-request: https://github.com/SerenityOS/serenity/pull/9356
Issue: https://github.com/SerenityOS/serenity/issues/9351
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Userland/Utilities/grep.cpp
View file

@ -47,6 +47,7 @@ int main(int argc, char** argv)
BinaryFileMode binary_mode { BinaryFileMode::Binary }; BinaryFileMode binary_mode { BinaryFileMode::Binary };
bool case_insensitive = false; bool case_insensitive = false;
bool invert_match = false; bool invert_match = false;
bool colored_output = isatty(STDOUT_FILENO);
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
args_parser.add_option(recursive, "Recursively scan files starting in working directory", "recursive", 'r'); args_parser.add_option(recursive, "Recursively scan files starting in working directory", "recursive", 'r');
@ -90,6 +91,22 @@ int main(int argc, char** argv)
return true; return true;
}, },
}); });
args_parser.add_option(Core::ArgsParser::Option {
.requires_argument = true,
.help_string = "When to use colored output for the matching text ([auto], never, always)",
.long_name = "color",
.short_name = 0,
.value_name = "WHEN",
.accept_value = [&](auto* str) {
if ("never"sv == str)
colored_output = false;
else if ("always"sv == str)
colored_output = true;
else if ("auto"sv != str)
return false;
return true;
},
});
args_parser.add_positional_argument(files, "File(s) to process", "file", Core::ArgsParser::Required::No); args_parser.add_positional_argument(files, "File(s) to process", "file", Core::ArgsParser::Required::No);
args_parser.parse(argc, argv); args_parser.parse(argc, argv);
@ -114,15 +131,13 @@ int main(int argc, char** argv)
auto result = re.match(str, PosixFlags::Global); auto result = re.match(str, PosixFlags::Global);
if (result.success ^ invert_match) { if (result.success ^ invert_match) {
if (is_binary && binary_mode == BinaryFileMode::Binary) { if (is_binary && binary_mode == BinaryFileMode::Binary) {
outln("binary file \x1B[34m{}\x1B[0m matches", filename); outln(colored_output ? "binary file \x1B[34m{}\x1B[0m matches" : "binary file {} matches", filename);
} else { } else {
if ((result.matches.size() || invert_match) && print_filename) { if ((result.matches.size() || invert_match) && print_filename)
out("\x1B[34m{}:\x1B[0m", filename); out(colored_output ? "\x1B[34m{}:\x1B[0m" : "{}:", filename);
}
for (auto& match : result.matches) { for (auto& match : result.matches) {
out(colored_output ? "{}\x1B[32m{}\x1B[0m" : "{}{}",
out("{}\x1B[32m{}\x1B[0m",
StringView(&str[last_printed_char_pos], match.global_offset - last_printed_char_pos), StringView(&str[last_printed_char_pos], match.global_offset - last_printed_char_pos),
match.view.to_string()); match.view.to_string());
last_printed_char_pos = match.global_offset + match.view.length(); last_printed_char_pos = match.global_offset + match.view.length();