Skip to content

Enhance usage output in main.c to include detailed descriptions for r… #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abewartech wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Enhance usage output in main.c to include detailed descriptions for r… #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f18b03
Enhance usage output in main.c to include detailed descriptions for r…
Dec 29, 2025
f29f529
Filter out "ubus_rpc_session" from ubus object call arguments to prev…
Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions lib/ubus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1469,6 +1469,11 @@ uc_ubus_object_call_args(struct ubus_object *obj, const char *ubus_method_name,
return UBUS_STATUS_INVALID_ARGUMENT;

hdr = blob_data(attr);

/* skip ubus_rpc_session, it's automatically added by rpcd/uhttpd */
if (!strcmp((char *)hdr->name, "ubus_rpc_session"))
continue;

found = false;

for (i = 0; i < method->n_policy; i++) {
Expand Down
14 changes: 11 additions & 3 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@ static FILE *stdin_unused;
static void
print_usage(const char *app)
{
bool default_raw_mode = strcmp(app, "utpl");
const char *default_mode_desc = default_raw_mode
? "Process source file(s) as raw script code (default)."
: "Process source file(s) as raw script code.";
const char *template_mode_desc = default_raw_mode
? "Process the source file(s) as templates, not as raw script code."
: "Process the source file(s) as templates (default).";

printf(
"Usage:\n"
" %1$s -h\n"
Expand Down Expand Up @@ -65,10 +73,10 @@ print_usage(const char *app)
" Enable strict mode.\n\n"

"-R\n"
" Process source file(s) as raw script code (default).\n\n"
" %2$s\n\n"

"-T[flag,flag,...]\n"
" Process the source file(s) as templates, not as raw script code.\n"
" %3$s\n"
" Supported flags: no-lstrip (don't strip leading whitespace before\n"
" block tags), no-rtrim (don't strip trailing newline after block tags).\n\n"

Expand Down Expand Up @@ -107,7 +115,7 @@ print_usage(const char *app)
"-s\n"
" Omit (strip) debug information when compiling files.\n"
" Only meaningful in conjunction with `-c`.\n\n",
app);
app, default_mode_desc, template_mode_desc);
}


Expand Down