system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-09-16 06:30:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

chgrp: Use StringView instead of 'char const*'

Browse source 
This gets rid of a couple ad-hoc instances of DeprecatedString and makes
it more trivial to use the fallible function Core::System::getgrnam() in
place of LibC's getgrnam().
This commit is contained in:
Kenneth Myhra 2023-01-08 14:47:12 +01:00 committed by Linus Groh
parent 6b3cf21964
commit a28aa8e6c1
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Userland/Utilities/chgrp.cpp
View file

@ -4,18 +4,16 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <AK/DeprecatedString.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <grp.h>
#include <string.h>
ErrorOr<int> serenity_main(Main::Arguments arguments)
{
TRY(Core::System::pledge("stdio rpath chown"));
char const* gid_arg = nullptr;
StringView gid_arg;
StringView path {};
bool dont_follow_symlinks = false;
@ -28,17 +26,17 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
gid_t new_gid = -1;
if (DeprecatedString(gid_arg).is_empty()) {
if (gid_arg.is_empty()) {
warnln("Empty gid option");
return 1;
}
auto number = DeprecatedString(gid_arg).to_uint();
auto number = gid_arg.to_uint();
if (number.has_value()) {
new_gid = number.value();
} else {
auto* group = getgrnam(gid_arg);
if (!group) {
auto group = TRY(Core::System::getgrnam(gid_arg));
if (!group.has_value()) {
warnln("Unknown group '{}'", gid_arg);
return 1;
}