From fb45e383c2985c43a9aaf42050fef039473745ce Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 11 Feb 2011 01:21:07 +0100 Subject: remove separate catch all list, always require a pattern argument for registering events, even if it is just * --- cli.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'cli.c') diff --git a/cli.c b/cli.c index 61f1bb2..d020b8e 100644 --- a/cli.c +++ b/cli.c @@ -108,17 +108,25 @@ static int ubus_cli_listen(struct ubus_context *ctx, int argc, char **argv) memset(&listener, 0, sizeof(listener)); listener.cb = receive_event; - if (!argc) { + if (argc > 0) { + event = argv[0]; + } else { event = "*"; - ret = ubus_register_event_handler(ctx, &listener, NULL); + argc = 1; } - for (;argc;argv++, argc--) { - event = argv[0]; - ret = ubus_register_event_handler(ctx, &listener, argv[0]); + do { + ret = ubus_register_event_handler(ctx, &listener, event); if (ret) break; - } + + argv++; + argc--; + if (argc <= 0) + break; + + event = argv[0]; + } while (1); if (ret) { fprintf(stderr, "Error while registering for event '%s': %s\n", -- cgit v1.2.1