summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Kaster <akaster@serenityos.org>2023-02-25 14:27:46 -0700
committerLinus Groh <mail@linusgroh.de>2023-02-25 22:31:17 +0100
commit72a48ee1eeb9fc7b9a874fb32a7ff7fd3a61877a (patch)
tree2b4cc77d3404579c422e1bf82d469aceb40ee1bb
parent19ca8d7fb7ccc02889684e85c9d90d472166bdee (diff)
downloadserenity-72a48ee1eeb9fc7b9a874fb32a7ff7fd3a61877a.zip
LibCore+Utilities: Replace uses of strpbrk with find_any_of()
We don't need to use scary C string POSIX APIs when we have nicer ones on String/DeprecatedString.
-rw-r--r--Userland/Libraries/LibCore/Group.cpp2
-rw-r--r--Userland/Utilities/useradd.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/Userland/Libraries/LibCore/Group.cpp b/Userland/Libraries/LibCore/Group.cpp
index bf99278b1b..3baa651164 100644
--- a/Userland/Libraries/LibCore/Group.cpp
+++ b/Userland/Libraries/LibCore/Group.cpp
@@ -74,7 +74,7 @@ ErrorOr<void> Group::add_group(Group& group)
return Error::from_string_literal("Group name can not be empty.");
// A quick sanity check on group name
- if (strpbrk(group.name().characters(), "\\/!@#$%^&*()~+=`:\n"))
+ if (group.name().find_any_of("\\/!@#$%^&*()~+=`:\n"sv, DeprecatedString::SearchDirection::Forward).has_value())
return Error::from_string_literal("Group name has invalid characters.");
// Disallow names starting with '_', '-' or other non-alpha characters.
diff --git a/Userland/Utilities/useradd.cpp b/Userland/Utilities/useradd.cpp
index 4767562f7c..0bef6ae42b 100644
--- a/Userland/Utilities/useradd.cpp
+++ b/Userland/Utilities/useradd.cpp
@@ -53,7 +53,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
args_parser.parse(arguments);
// Let's run a quick sanity check on username
- if (strpbrk(username.characters(), "\\/!@#$%^&*()~+=`:\n")) {
+ if (username.find_any_of("\\/!@#$%^&*()~+=`:\n"sv, DeprecatedString::SearchDirection::Forward).has_value()) {
warnln("invalid character in username, {}", username);
return 1;
}