X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=cli.c;h=de159473cb58077b2426a9c97eb5ebf9cd72b312;hp=9e16bc8f47bd338b2109e9e5074e500c469d18fc;hb=df69022bebe444a0c2ec2c9316748dc1dd833b4e;hpb=460672c6dab5f8d8ab67dc4955cea2137ed11990

diff --git a/cli.c b/cli.c
index 9e16bc8..de15947 100644
--- a/cli.c
+++ b/cli.c
@@ -19,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)
 {
@@ -48,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;
 	}
@@ -71,7 +72,7 @@ static void receive_call_result_data(struct ubus_request *req, int type, struct
 	if (!msg)
 		return;
 
-	str = blobmsg_format_json_indent(msg, true, 0);
+	str = blobmsg_format_json_indent(msg, true, simple_output ? -1 : 0);
 	printf("%s\n", str);
 	free(str);
 }
@@ -189,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"
@@ -220,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;
@@ -231,6 +233,9 @@ int main(int argc, char **argv)
 		case 'S':
 			simple_output = true;
 			break;
+		case 'v':
+			verbose++;
+			break;
 		default:
 			return usage(progname);
 		}