mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-08-17 01:10:28 +03:00
Userland: Pretty print the help text in BuggieBox
Now, in the help text, the names of all the supported utilities and aliases are dynamically generated with the macro so that if new utilities are added in the future they will get included automatically. These utilities are printed in table-like format for some "aesthetics".
This commit is contained in:
parent
06ee4b66d0
commit
b326a301c3
Notes:
sideshowbarker
2024-07-16 22:26:05 +09:00
Author: https://github.com/ronak69 Commit: https://github.com/SerenityOS/serenity/commit/b326a301c3 Pull-request: https://github.com/SerenityOS/serenity/pull/20393 Reviewed-by: https://github.com/AtkinsSJ Reviewed-by: https://github.com/timschumi ✅
@ -54,12 +54,30 @@ ENUMERATE_UTILITIES(DECLARE_ENTRYPOINT, SKIP)
|
||||
|
||||
static void fail()
|
||||
{
|
||||
out(stderr, "Direct running of BuggieBox was detected without finding a proper requested utility.\n");
|
||||
out(stderr, "The following programs are supported: uname, env, lsblk, file, df, mount, umount, mkdir, ");
|
||||
out(stderr, "rmdir, rm, chown, chmod, cp, ln, ls, mv, cat, md5sum, sha1sum, sha256sum, sha512sum, sh, uniq, id, tail, ");
|
||||
out(stderr, "find, less, mknod, ps\n");
|
||||
out(stderr, "To use one of these included utilities, create a symbolic link with the target being this binary, and ensure the basename");
|
||||
out(stderr, "is included within.\n");
|
||||
#define TOOL_NAME(name) #name##sv,
|
||||
#define ALIAS_NAME(alias, name) #alias##sv,
|
||||
auto const tool_names = {
|
||||
ENUMERATE_UTILITIES(TOOL_NAME, ALIAS_NAME)
|
||||
};
|
||||
#undef TOOL_NAME
|
||||
#undef ALIAS_NAME
|
||||
|
||||
outln(stderr);
|
||||
outln(stderr, "Usage:");
|
||||
outln(stderr, "* Specify a utility as an argument:");
|
||||
outln(stderr, " $ BuggieBox UTILITY");
|
||||
outln(stderr, "* Create a symbolic link with the target being this binary,");
|
||||
outln(stderr, " and ensure the basename is one of the supported utilities' name.");
|
||||
|
||||
outln(stderr);
|
||||
outln(stderr, "The following utilities are supported:");
|
||||
int count = 0;
|
||||
for (auto const& tool_name : tool_names) {
|
||||
if (++count % 5 == 1)
|
||||
out(stderr, "\n\t");
|
||||
out(stderr, "{:12}", tool_name);
|
||||
}
|
||||
outln(stderr);
|
||||
}
|
||||
|
||||
struct Runner {
|
||||
@ -89,14 +107,17 @@ static ErrorOr<int> run_program(Main::Arguments arguments, LexicalPath const& ru
|
||||
static ErrorOr<int> buggiebox_main(Main::Arguments arguments)
|
||||
{
|
||||
if (arguments.argc == 0) {
|
||||
outln(stderr, "Detected directly running BuggieBox without specifying a utility.");
|
||||
fail();
|
||||
return 1;
|
||||
}
|
||||
bool found_runner = false;
|
||||
LexicalPath runbase { arguments.strings[0] };
|
||||
auto result = TRY(run_program(arguments, runbase, found_runner));
|
||||
if (!found_runner)
|
||||
if (!found_runner) {
|
||||
outln(stderr, "'{}' is not supported by BuggieBox.", runbase);
|
||||
fail();
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user