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

Userland+Terminal: Port to new CArgsParser API

Browse source 
While at it, also add some niceties and fix some things.
This commit is contained in:
Sergey Bugaev 2020-01-27 20:25:36 +03:00 • committed by Andreas Kling
parent 9276582535
commit f983dfe319
22 changed files with 392 additions and 653 deletions
Download patch file Download diff file Expand all files Collapse all files

107
Userland/chroot.cpp
View file

@ -24,82 +24,51 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <AK/String.h>
#include <AK/StringView.h>
#include <LibCore/CArgsParser.h>
#include <stdio.h>
#include <unistd.h>
struct Options {
const char* path;
const char* program { "/bin/Shell" };
int flags { -1 };
};
void print_usage(const char* argv0)
{
fprintf(
stderr,
"Usage:\n"
"\t%s <path> [program] [-o options]\n",
argv0
);
}
Options parse_options(int argc, char** argv)
{
Options options;
if (argc < 2) {
print_usage(argv[0]);
exit(1);
}
options.path = argv[1];
int i = 2;
if (i < argc && argv[i][0] != '-')
options.program = argv[i++];
if (i >= argc)
return options;
if (strcmp(argv[i], "-o") != 0) {
print_usage(argv[0]);
exit(1);
}
i++;
if (i >= argc) {
print_usage(argv[0]);
exit(1);
}
options.flags = 0;
StringView arg = argv[i];
Vector<StringView> parts = arg.split_view(',');
for (auto& part : parts) {
if (part == "defaults")
continue;
else if (part == "nodev")
options.flags |= MS_NODEV;
else if (part == "noexec")
options.flags |= MS_NOEXEC;
else if (part == "nosuid")
options.flags |= MS_NOSUID;
else if (part == "bind")
fprintf(stderr, "Ignoring -o bind, as it doesn't make sense for chroot");
else
fprintf(stderr, "Ignoring invalid option: %s\n", String(part).characters());
}
return options;
}
int main(int argc, char** argv)
{
const char* path = nullptr;
const char* program = "/bin/Shell";
int flags = -1;
Options options = parse_options(argc, argv);
CArgsParser args_parser;
args_parser.add_positional_argument(path, "New root directory", "path");
args_parser.add_positional_argument(program, "Program to run", "program", CArgsParser::Required::No);
if (chroot_with_mount_flags(options.path, options.flags) < 0) {
CArgsParser::Option option {
true,
"Mount options",
"options",
'o',
"options",
[&flags](const char* s) {
flags = 0;
Vector<StringView> parts = StringView(s).split_view(',');
for (auto& part : parts) {
if (part == "defaults")
continue;
else if (part == "nodev")
flags |= MS_NODEV;
else if (part == "noexec")
flags |= MS_NOEXEC;
else if (part == "nosuid")
flags |= MS_NOSUID;
else if (part == "bind")
fprintf(stderr, "Ignoring -o bind, as it doesn't make sense for chroot\n");
else
return false;
}
return true;
}
};
args_parser.add_option(move(option));
args_parser.parse(argc, argv);
if (chroot_with_mount_flags(path, flags) < 0) {
perror("chroot");
return 1;
}
@ -109,7 +78,7 @@ int main(int argc, char** argv)
return 1;
}
execl(options.program, options.program, nullptr);
execl(program, program, nullptr);
perror("execl");
return 1;
}