RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 07:18:11 +00:00
Code Issues Activity Actions

Utilities: cut: Move string splitting into expand_list

Browse source
This commit is contained in:
Tim Schumacher 2021-11-09 02:06:38 +01:00 • committed by Andreas Kling
parent 2358f6cbda
commit ed3a5f6b9d
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Utilities/cut.cpp
View file

@ -50,8 +50,10 @@ static void add_if_not_exists(Vector<Index>& indices, Index data)
} }
} }
static bool expand_list(Vector<String>& tokens, Vector<Index>& indices) static bool expand_list(String& list, Vector<Index>& indices)
{ {
Vector<String> tokens = list.split(',');
for (auto& token : tokens) { for (auto& token : tokens) {
if (token.length() == 0) { if (token.length() == 0) {
warnln("cut: byte/character positions are numbered from 1"); warnln("cut: byte/character positions are numbered from 1");
@ -181,7 +183,7 @@ static void cut_file(const String& file, const Vector<Index>& byte_vector)
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
String byte_list = ""; String byte_list = "";
Vector<String> tokens;
Vector<String> files; Vector<String> files;
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
@ -195,10 +197,8 @@ int main(int argc, char** argv)
return 1; return 1;
} }
tokens = byte_list.split(',');
Vector<Index> byte_vector; Vector<Index> byte_vector;
auto expansion_successful = expand_list(tokens, byte_vector); auto expansion_successful = expand_list(byte_list, byte_vector);
if (!expansion_successful) { if (!expansion_successful) {
args_parser.print_usage(stderr, argv[0]); args_parser.print_usage(stderr, argv[0]);