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

mknod: Add option for specifying file permissions

Browse source
This commit is contained in:
Monroe Clinton 2023-05-23 21:27:21 -04:00 committed by Jelle Raaijmakers
parent 704d289851
commit ff970e9295
1 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Userland/Utilities/mknod.cpp
View file

@ -1,11 +1,13 @@
/* /*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2023, the SerenityOS developers.
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/Format.h> #include <AK/Format.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/FilePermissionsMask.h>
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <stdlib.h> #include <stdlib.h>
@ -16,6 +18,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
TRY(Core::System::pledge("stdio dpath")); TRY(Core::System::pledge("stdio dpath"));
StringView mode_string { "0666"sv };
StringView name; StringView name;
StringView type_string; StringView type_string;
StringView major_string; StringView major_string;
@ -23,53 +26,58 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
args_parser.set_general_help("Creates a file system node."); args_parser.set_general_help("Creates a file system node.");
args_parser.add_option(mode_string, "File mode in octal or symbolic notation", "mode", 'm', "mode");
args_parser.add_positional_argument(name, "Pathname to create", "name", Core::ArgsParser::Required::Yes); args_parser.add_positional_argument(name, "Pathname to create", "name", Core::ArgsParser::Required::Yes);
args_parser.add_positional_argument(type_string, "Type of file to create", "type", Core::ArgsParser::Required::Yes); args_parser.add_positional_argument(
type_string,
"Type of file to create <b|c|u|p>"
"\n\t\tb\tcreate a block special file"
"\n\t\tc, u\tcreate a character special file"
"\n\t\tp\tcreate a FIFO",
"type",
Core::ArgsParser::Required::Yes);
args_parser.add_positional_argument(major_string, "Major device number", "major", Core::ArgsParser::Required::No); args_parser.add_positional_argument(major_string, "Major device number", "major", Core::ArgsParser::Required::No);
args_parser.add_positional_argument(minor_string, "Minor device number", "minor", Core::ArgsParser::Required::No); args_parser.add_positional_argument(minor_string, "Minor device number", "minor", Core::ArgsParser::Required::No);
args_parser.parse(arguments); args_parser.parse(arguments);
// FIXME: Add some kind of option for specifying the file permissions. auto mask = TRY(Core::FilePermissionsMask::parse(mode_string));
mode_t mode = 0666;
char type = type_string[0]; char type = type_string[0];
mode_t mode;
switch (type) { switch (type) {
case 'c': case 'c':
case 'u': case 'u':
mode |= S_IFCHR; mode = mask.apply(S_IFCHR);
break; break;
case 'b': case 'b':
mode |= S_IFBLK; mode = mask.apply(S_IFBLK);
break; break;
case 'p': case 'p':
mode |= S_IFIFO; mode = mask.apply(S_IFIFO);
break; break;
default: default:
warnln("Invalid device type {}", type); warnln("Invalid device type {}", type);
return 1; return 1;
} }
auto maybe_major = major_string.to_int();
auto maybe_minor = minor_string.to_int();
dev_t device;
if (type == 'p') { if (type == 'p') {
if (!major_string.is_empty() || !minor_string.is_empty()) { if (maybe_major.has_value() || maybe_minor.has_value()) {
warnln("Do not set device numbers when creating FIFO"); warnln("Do not set device numbers when creating FIFO");
return 1; return 1;
} }
device = makedev(0, 0);
} else { } else {
if (major_string.is_empty() || minor_string.is_empty()) { if (!(maybe_major.has_value() && maybe_minor.has_value())) {
warnln("Major and minor device numbers are required"); warnln("Major and minor device numbers are required");
return 1; return 1;
} }
device = makedev(maybe_major.value(), maybe_minor.value());
} }
int major = 0; TRY(Core::System::mknod(name, mode, device));
int minor = 0;
if (type != 'p') {
major = atoi(major_string.characters_without_null_termination());
minor = atoi(minor_string.characters_without_null_termination());
}
TRY(Core::System::mknod(name, mode, makedev(major, minor)));
return 0; return 0;
} }