RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-28 16:55:09 +00:00
Code Issues Activity Actions

cut: Add -s option to suppress lines without field delimiters

Browse source 
If this option is not specified, lines that contain to field
delimiters will be printed unmodified.
This commit is contained in:
Tim Ledbetter 2023-06-24 20:55:38 +01:00 • committed by Andreas Kling
parent e740489abd
commit dedbc17160
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Base/usr/share/man/man1/cut.md
View file

@ -23,6 +23,7 @@ With no FILE, or when FILE is -, read standard input.
* `-b` `--bytes=list`: Select only these bytes * `-b` `--bytes=list`: Select only these bytes
* `-f` `--fields=list`: select only these fields; also print any line that contains no delimiter character * `-f` `--fields=list`: select only these fields; also print any line that contains no delimiter character
* `-d` `--delimiter=delim`: use `delim` instead of `tab` for field delimiter * `-d` `--delimiter=delim`: use `delim` instead of `tab` for field delimiter
* `-s`, `only-delimited`: suppress lines which don't contain any field delimiter characters
## Examples ## Examples

10
Userland/Utilities/cut.cpp
View file

@ -134,11 +134,13 @@ static void process_line_bytes(StringView line, Vector<Range> const& ranges)
outln(); outln();
} }
static void process_line_fields(StringView line, Vector<Range> const& ranges, char delimiter) static void process_line_fields(StringView line, Vector<Range> const& ranges, char delimiter, bool only_print_delimited_lines)
{ {
auto string_split = DeprecatedString(line).split(delimiter, SplitBehavior::KeepEmpty); auto string_split = DeprecatedString(line).split(delimiter, SplitBehavior::KeepEmpty);
if (string_split.size() == 1) { if (string_split.size() == 1) {
outln("{}", line); if (!only_print_delimited_lines)
outln("{}", line);
return; return;
} }
@ -157,6 +159,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
DeprecatedString byte_list = ""; DeprecatedString byte_list = "";
DeprecatedString fields_list = ""; DeprecatedString fields_list = "";
DeprecatedString delimiter = "\t"; DeprecatedString delimiter = "\t";
bool only_print_delimited_lines = false;
Vector<StringView> files; Vector<StringView> files;
@ -165,6 +168,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
args_parser.add_option(byte_list, "select only these bytes", "bytes", 'b', "list"); args_parser.add_option(byte_list, "select only these bytes", "bytes", 'b', "list");
args_parser.add_option(fields_list, "select only these fields", "fields", 'f', "list"); args_parser.add_option(fields_list, "select only these fields", "fields", 'f', "list");
args_parser.add_option(delimiter, "set a custom delimiter", "delimiter", 'd', "delimiter"); args_parser.add_option(delimiter, "set a custom delimiter", "delimiter", 'd', "delimiter");
args_parser.add_option(only_print_delimited_lines, "suppress lines which don't contain any field delimiter characters", "only-delimited", 's');
args_parser.parse(arguments); args_parser.parse(arguments);
bool selected_bytes = (byte_list != ""); bool selected_bytes = (byte_list != "");
@ -249,7 +253,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
if (selected_bytes) { if (selected_bytes) {
process_line_bytes(line, disjoint_ranges); process_line_bytes(line, disjoint_ranges);
} else if (selected_fields) { } else if (selected_fields) {
process_line_fields(line, disjoint_ranges, delimiter[0]); process_line_fields(line, disjoint_ranges, delimiter[0], only_print_delimited_lines);
} else { } else {
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }