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

LibCore+Utilities: Replace uses of strpbrk with find_any_of()

Browse source 
We don't need to use scary C string POSIX APIs when we have nicer ones
on String/DeprecatedString.
This commit is contained in:
Andrew Kaster 2023-02-25 14:27:46 -07:00 • committed by Linus Groh
parent 19ca8d7fb7
commit 72a48ee1ee
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibCore/Group.cpp
View file

@ -74,7 +74,7 @@ ErrorOr<void> Group::add_group(Group& group)
return Error::from_string_literal("Group name can not be empty."); return Error::from_string_literal("Group name can not be empty.");
// A quick sanity check on group name // 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."); return Error::from_string_literal("Group name has invalid characters.");
// Disallow names starting with '_', '-' or other non-alpha characters. // Disallow names starting with '_', '-' or other non-alpha characters.

2
Userland/Utilities/useradd.cpp
View file

@ -53,7 +53,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
args_parser.parse(arguments); args_parser.parse(arguments);
// Let's run a quick sanity check on username // 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); warnln("invalid character in username, {}", username);
return 1; return 1;
} }