lua: add a prototype for luaopen_ubus so that -Wmissing-declarations can be enabled

[project/ubus.git] / cli.c

diff --git a/cli.c b/cli.c
index ef1b893..de15947 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -1,3 +1,16 @@
+/*
+ * Copyright (C) 2011 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #include <unistd.h>
 
 #include <libubox/blobmsg_json.h>
@@ -6,6 +19,7 @@
 static struct blob_buf b;
 static int timeout = 30;
 static bool simple_output = false;
+static int verbose = 0;
 
 static const char *format_type(void *priv, struct blob_attr *attr)
 {
@@ -35,7 +49,7 @@ static void receive_list_result(struct ubus_context *ctx, struct ubus_object_dat
        char *s;
        int rem;
 
-       if (simple_output) {
+       if (simple_output || !verbose) {
                printf("%s\n", obj->path);
                return;
        }
@@ -46,7 +60,7 @@ static void receive_list_result(struct ubus_context *ctx, struct ubus_object_dat
                return;
 
        blob_for_each_attr(cur, obj->signature, rem) {
-               s = blobmsg_format_json_with_cb(cur, false, format_type, NULL);
+               s = blobmsg_format_json_with_cb(cur, false, format_type, NULL, -1);
                printf("\t%s\n", s);
                free(s);
        }
@@ -58,7 +72,7 @@ static void receive_call_result_data(struct ubus_request *req, int type, struct
        if (!msg)
                return;
 
-       str = blobmsg_format_json(msg, true);
+       str = blobmsg_format_json_indent(msg, true, simple_output ? -1 : 0);
        printf("%s\n", str);
        free(str);
 }
@@ -96,7 +110,8 @@ static int ubus_cli_call(struct ubus_context *ctx, int argc, char **argv)
 
        blob_buf_init(&b, 0);
        if (argc == 3 && !blobmsg_add_json_from_string(&b, argv[2])) {
-               fprintf(stderr, "Failed to parse message data\n");
+               if (!simple_output)
+                       fprintf(stderr, "Failed to parse message data\n");
                return -1;
        }
 
@@ -137,8 +152,9 @@ static int ubus_cli_listen(struct ubus_context *ctx, int argc, char **argv)
        } while (1);
 
        if (ret) {
-               fprintf(stderr, "Error while registering for event '%s': %s\n",
-                       event, ubus_strerror(ret));
+               if (!simple_output)
+                       fprintf(stderr, "Error while registering for event '%s': %s\n",
+                               event, ubus_strerror(ret));
                return -1;
        }
 
@@ -158,7 +174,8 @@ static int ubus_cli_send(struct ubus_context *ctx, int argc, char **argv)
        blob_buf_init(&b, 0);
 
        if (argc == 2 && !blobmsg_add_json_from_string(&b, argv[1])) {
-               fprintf(stderr, "Failed to parse message data\n");
+               if (!simple_output)
+                       fprintf(stderr, "Failed to parse message data\n");
                return -1;
        }
 
@@ -173,6 +190,7 @@ static int usage(const char *prog)
                " -s <socket>:          Set the unix domain socket to connect to\n"
                " -t <timeout>:         Set the timeout (in seconds) for a command to complete\n"
                " -S:                   Use simplified output (for scripts)\n"
+               " -v:                   More verbose output\n"
                "\n"
                "Commands:\n"
                " - list [<path>]                       List objects\n"
@@ -204,7 +222,7 @@ int main(int argc, char **argv)
 
        progname = argv[0];
 
-       while ((ch = getopt(argc, argv, "s:t:S")) != -1) {
+       while ((ch = getopt(argc, argv, "vs:t:S")) != -1) {
                switch (ch) {
                case 's':
                        ubus_socket = optarg;
@@ -215,6 +233,9 @@ int main(int argc, char **argv)
                case 'S':
                        simple_output = true;
                        break;
+               case 'v':
+                       verbose++;
+                       break;
                default:
                        return usage(progname);
                }
@@ -229,7 +250,8 @@ int main(int argc, char **argv)
 
        ctx = ubus_connect(ubus_socket);
        if (!ctx) {
-               fprintf(stderr, "Failed to connect to ubus\n");
+               if (!simple_output)
+                       fprintf(stderr, "Failed to connect to ubus\n");
                return -1;
        }
 
@@ -245,7 +267,7 @@ int main(int argc, char **argv)
                break;
        }
 
-       if (ret > 0)
+       if (ret > 0 && !simple_output)
                fprintf(stderr, "Command failed: %s\n", ubus_strerror(ret));
        else if (ret == -2)
                usage(progname);