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

Utilities: Fix the --list-syscalls option to syscall(1)

Browse source 
The 'syscall-arguments' positional arg being required was
breaking the scenario where the user just passes the
'--list-syscalls' argument.

Instead, make the argument not required, and manually handle
the error path our selves.

Closes: #6574
This commit is contained in:
Brian Gianforcaro 2021-04-23 02:11:09 -07:00 • committed by Linus Groh
parent 161fd1c153
commit 072c264a04
1 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Userland/Utilities/syscall.cpp
View file

@ -24,6 +24,14 @@ using ArgIter = Arguments::Iterator;
static FlatPtr parse_from(ArgIter&); static FlatPtr parse_from(ArgIter&);
template<>
struct AK::Formatter<Syscall::Function> : Formatter<StringView> {
void format(FormatBuilder& builder, Syscall::Function function)
{
return Formatter<StringView>::format(builder, to_string(function));
}
};
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
bool output_buffer = false; bool output_buffer = false;
@ -42,11 +50,24 @@ int main(int argc, char** argv)
" - Arguments that cannot be interpreted are treated as string arguments, for example 'Hello, friends!'.\n" " - Arguments that cannot be interpreted are treated as string arguments, for example 'Hello, friends!'.\n"
"\n" "\n"
"Full example: syscall -o realpath [ /usr/share/man/man2/getgid.md 1024 buf 1024 ]"); "Full example: syscall -o realpath [ /usr/share/man/man2/getgid.md 1024 buf 1024 ]");
args_parser.add_option(list_syscalls, "List all existing syscalls, and exit", "list-syscalls", 'l');
args_parser.add_option(output_buffer, "Output the contents of the buffer (beware of stray zero bytes!)", "output-buffer", 'o'); args_parser.add_option(output_buffer, "Output the contents of the buffer (beware of stray zero bytes!)", "output-buffer", 'o');
args_parser.add_option(list_syscalls, "List all existing syscalls", "list-syscalls", 'l'); args_parser.add_positional_argument(arguments, "Syscall arguments; see general help.", "syscall-arguments", Core::ArgsParser::Required::No);
args_parser.add_positional_argument(arguments, "Syscall arguments; see general help.", "syscall-arguments");
args_parser.parse(argc, argv); args_parser.parse(argc, argv);
if (list_syscalls) {
outln("syscall list:");
for (int sc = 0; sc < Syscall::Function::__Count; ++sc) {
outln(" \033[33;1m{}\033[0m - {}", sc, static_cast<Syscall::Function>(sc));
}
exit(0);
}
if (arguments.is_empty()) {
args_parser.print_usage(stderr, argv[0]);
exit(1);
}
ArgIter iter = arguments.begin(); ArgIter iter = arguments.begin();
for (size_t i = 0; i < SC_NARG && !iter.is_end(); i++) { for (size_t i = 0; i < SC_NARG && !iter.is_end(); i++) {
arg[i] = parse_from(iter); arg[i] = parse_from(iter);