external/miraclecast
1
0
Fork 0
mirror of https://github.com/albfan/miraclecast.git synced 2025-03-09 23:38:56 +00:00
Code Issues Releases Wiki Activity

miraclectl: make add-link accept a single argument

Browse source 
The add-link argument turned out to be confusing so avoid the split input
and use the same name as all the other commands. We now split it
internally so the DBus call will work properly.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
This commit is contained in:
David Herrmann 2014-02-10 18:36:29 +01:00
parent 44574b1d81
commit bbe1050906
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/miraclectl.c
View file

@ -623,10 +623,22 @@ static int verb_add_link(sd_bus *bus, char **args, unsigned int n)
{ {
_cleanup_sd_bus_error_ sd_bus_error err = SD_BUS_ERROR_NULL; _cleanup_sd_bus_error_ sd_bus_error err = SD_BUS_ERROR_NULL;
_cleanup_sd_bus_message_ sd_bus_message *m = NULL; _cleanup_sd_bus_message_ sd_bus_message *m = NULL;
_cleanup_free_ char *link = NULL; _cleanup_free_ char *link = NULL, *type = NULL;
const char *name; const char *name;
char *t, *iface;
int r; int r;
type = strdup(args[1]);
if (!type)
return log_ENOMEM();
t = strchr(type, ':');
if (!t)
return log_EINVAL();
*t = 0;
iface = t + 1;
r = sd_bus_call_method(bus, r = sd_bus_call_method(bus,
"org.freedesktop.miracle", "org.freedesktop.miracle",
"/org/freedesktop/miracle", "/org/freedesktop/miracle",
@ -634,10 +646,10 @@ static int verb_add_link(sd_bus *bus, char **args, unsigned int n)
"AddLink", "AddLink",
&err, &err,
&m, &m,
"ss", args[1], args[2]); "ss", type, iface);
if (r < 0) { if (r < 0) {
log_error("cannot add link %s:%s: %s", log_error("cannot add link %s:%s: %s",
args[1], args[2], bus_error_message(&err, r)); type, iface, bus_error_message(&err, r));
return r; return r;
} }
@ -1166,7 +1178,7 @@ static int miraclectl_main(sd_bus *bus, int argc, char *argv[])
{ "list", LESS, 1, verb_list }, { "list", LESS, 1, verb_list },
{ "show-link", EQUAL, 2, verb_show_link }, { "show-link", EQUAL, 2, verb_show_link },
{ "show-peer", EQUAL, 2, verb_show_peer }, { "show-peer", EQUAL, 2, verb_show_peer },
{ "add-link", EQUAL, 3, verb_add_link }, { "add-link", EQUAL, 2, verb_add_link },
{ "remove-link", EQUAL, 2, verb_remove_link }, { "remove-link", EQUAL, 2, verb_remove_link },
{ "set-link-name", EQUAL, 3, verb_set_link_name }, { "set-link-name", EQUAL, 3, verb_set_link_name },
{ "start-scan", EQUAL, 2, verb_start_scan }, { "start-scan", EQUAL, 2, verb_start_scan },