+/*
+ * 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>
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)
{
[BLOBMSG_TYPE_INT8] = "\"Boolean\"",
[BLOBMSG_TYPE_INT32] = "\"Integer\"",
[BLOBMSG_TYPE_STRING] = "\"String\"",
+ [BLOBMSG_TYPE_ARRAY] = "\"Array\"",
+ [BLOBMSG_TYPE_TABLE] = "\"Table\"",
};
const char *type = NULL;
int typeid;
char *s;
int rem;
- if (simple_output) {
+ if (simple_output || !verbose) {
printf("%s\n", obj->path);
return;
}
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);
}
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);
}
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;
}
} 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;
}
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;
}
" -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"
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;
case 'S':
simple_output = true;
break;
+ case 'v':
+ verbose++;
+ break;
default:
return usage(progname);
}
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;
}
break;
}
- if (ret > 0)
+ if (ret > 0 && !simple_output)
fprintf(stderr, "Command failed: %s\n", ubus_strerror(ret));
else if (ret == -2)
usage(progname);