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

UserspaceEmulator: Use Core::ArgsParser

Browse source
This commit is contained in:
Maciej Zygmanowski 2020-09-24 20:07:07 +02:00 • committed by Andreas Kling
parent 5a0b1c46aa
commit 53f3313cee
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
DevTools/UserspaceEmulator/main.cpp
View file

@ -30,6 +30,7 @@
#include <AK/LogStream.h> #include <AK/LogStream.h>
#include <AK/MappedFile.h> #include <AK/MappedFile.h>
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/DirIterator.h> #include <LibCore/DirIterator.h>
#include <LibELF/Loader.h> #include <LibELF/Loader.h>
#include <getopt.h> #include <getopt.h>
@ -38,12 +39,13 @@
int main(int argc, char** argv, char** env) int main(int argc, char** argv, char** env)
{ {
if (argc == 1) { Vector<const char*> command;
out() << "Usage: UserspaceEmulator <command>";
return 0;
}
auto executable_path = Core::find_executable_in_path(argv[1]); Core::ArgsParser parser;
parser.add_positional_argument(command, "Command to emulate", "command");
parser.parse(argc, argv);
auto executable_path = Core::find_executable_in_path(command[0]);
MappedFile mapped_file(executable_path); MappedFile mapped_file(executable_path);
if (!mapped_file.is_valid()) { if (!mapped_file.is_valid()) {
@ -54,8 +56,8 @@ int main(int argc, char** argv, char** env)
auto elf = ELF::Loader::create((const u8*)mapped_file.data(), mapped_file.size()); auto elf = ELF::Loader::create((const u8*)mapped_file.data(), mapped_file.size());
Vector<String> arguments; Vector<String> arguments;
for (int i = 1; i < argc; ++i) { for (auto arg: command) {
arguments.append(argv[i]); arguments.append(arg);
} }
Vector<String> environment; Vector<String> environment;