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

LibCore: Implement four-digit modes for FilePermissionsMask parsing

Browse source
This commit is contained in:
Tim Schumacher 2022-07-25 14:28:38 +02:00 • committed by Brian Gianforcaro
parent 130f04c493
commit 6c4b5775e1
2 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Userland/Libraries/LibCore/FilePermissionsMask.cpp
View file

@ -39,10 +39,19 @@ ErrorOr<FilePermissionsMask> FilePermissionsMask::parse(StringView string)
ErrorOr<FilePermissionsMask> FilePermissionsMask::from_numeric_notation(StringView string)
{
mode_t mode = AK::StringUtils::convert_to_uint_from_octal<u16>(string).value_or(01000);
if (mode > 0777)
string = string.trim_whitespace();
mode_t mode = AK::StringUtils::convert_to_uint_from_octal<u16>(string, TrimWhitespace::No).value_or(010000);
if (mode > 07777)
return Error::from_string_literal("invalid octal representation");
return move(FilePermissionsMask().assign_permissions(mode));
FilePermissionsMask mask;
mask.assign_permissions(mode);
// For compatibility purposes, just clear the special mode bits if we explicitly passed a 4-character mode.
if (string.length() >= 4)
mask.remove_permissions(07000);
return mask;
}
ErrorOr<FilePermissionsMask> FilePermissionsMask::from_symbolic_notation(StringView string)