remove an unnecessary check

[project/ubus.git] / cli.c

diff --git a/cli.c b/cli.c
index 54db4a2..ea1ec4d 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -34,10 +34,37 @@ static int usage(char *prog)
                "Commands:\n"
                " - list [<path>]                       List objects\n"
                " - call <path> <method> [<message>]    Call an object method\n"
+               " - listen [<path>...]                  Listen for events\n"
                "\n", prog);
        return 1;
 }
 
+static int ubus_cli_listen(struct ubus_context *ctx, int argc, char **argv)
+{
+       static struct ubus_object listener;
+       const char *event;
+       int ret = 0;
+
+       if (!argc) {
+               event = "*";
+               ret = ubus_register_event_handler(ctx, &listener, NULL);
+       }
+
+       for (;argc;argv++, argc--) {
+               event = argv[0];
+               ret = ubus_register_event_handler(ctx, &listener, argv[0]);
+               if (ret)
+                       break;
+       }
+
+       if (ret) {
+               fprintf(stderr, "Error while registering for event '%s': %s\n",
+                       event, ubus_strerror(ret));
+       }
+
+       return 0;
+}
+
 int main(int argc, char **argv)
 {
        static struct ubus_context *ctx;
@@ -70,6 +97,8 @@ int main(int argc, char **argv)
                ret = ubus_lookup_id(ctx, argv[2], &id);
                if (!ret)
                        ret = ubus_invoke(ctx, id, argv[3], NULL, receive_data, NULL);
+       } else if (!strcmp(cmd, "listen")) {
+               ret = ubus_cli_listen(ctx, argc - 2, argv + 2);
        } else {
                return usage(argv[0]);
        }
@@ -78,5 +107,5 @@ int main(int argc, char **argv)
                fprintf(stderr, "Failed: %s\n", ubus_strerror(ret));
 
        ubus_free(ctx);
-       return 0;
+       return ret;
 }