RPJosh
/
wayvnc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow 'wayvncctl foo --help' syntax 

Signed-off-by: Jim Ramsay <i.am@jimramsay.com>
pull/178/head
Jim Ramsay 2022-11-04 05:55:11 -04:00 committed by Andri Yngvason
parent 4b1fbf9508
commit 1275609aee
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ctl-client.c
View File

@ -110,9 +110,14 @@ static struct jsonipc_request* ctl_client_parse_args(struct ctl_client* self,
struct jsonipc_request* request = NULL; struct jsonipc_request* request = NULL;
const char* method = argv[0]; const char* method = argv[0];
json_t* params = json_object(); json_t* params = json_object();
bool show_usage = false;
for (int i = 1; i < argc; ++i) { for (int i = 1; i < argc; ++i) {
char* key = argv[i]; char* key = argv[i];
char* value = NULL; char* value = NULL;
if (strcmp(key, "--help") == 0 || strcmp(key, "-h") == 0) {
show_usage = true;
continue;
}
if (key[0] == '-' && key[1] == '-') if (key[0] == '-' && key[1] == '-')
key += 2; key += 2;
char* delim = strchr(key, '='); char* delim = strchr(key, '=');
@ -127,6 +132,12 @@ static struct jsonipc_request* ctl_client_parse_args(struct ctl_client* self,
} }
json_object_set_new(params, key, json_string(value)); json_object_set_new(params, key, json_string(value));
} }
if (show_usage) {
// Special case for "foo --help"; convert into "help --command=foo"
json_object_clear(params);
json_object_set_new(params, "command", json_string(method));
method = "help";
}
request = jsonipc_request_new(method, params); request = jsonipc_request_new(method, params);
failure: failure:

2
src/ctl-server.c
View File

@ -339,7 +339,7 @@ static struct cmd_response* generate_version_object()
return response; return response;
} }
static struct cmd_response* ctl_server_dispatch_cmd(struct ctl* self, struct cmd* cmd) static struct cmd_response* ctl_server_dispatch_cmd(struct ctl* self, struct cmd* cmd)
{ {
assert(cmd->type != CMD_UNKNOWN); assert(cmd->type != CMD_UNKNOWN);
const struct cmd_info* info = &cmd_list[cmd->type]; const struct cmd_info* info = &cmd_list[cmd->type];