projects
/
project
/
ubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cc82d89
)
add -v
author
Felix Fietkau
<nbd@openwrt.org>
Mon, 5 Sep 2011 02:00:20 +0000
(
04:00
+0200)
committer
Felix Fietkau
<nbd@openwrt.org>
Mon, 5 Sep 2011 02:00:20 +0000
(
04:00
+0200)
cli.c
patch
|
blob
|
history
diff --git
a/cli.c
b/cli.c
index
9e16bc8
..
98744cf
100644
(file)
--- 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 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)
{
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;
char *s;
int rem;
- if (simple_output) {
+ if (simple_output
|| !verbose
) {
printf("%s\n", obj->path);
return;
}
printf("%s\n", obj->path);
return;
}
@@
-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"
" -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"
"\n"
"Commands:\n"
" - list [<path>] List objects\n"
@@
-220,7
+222,7
@@
int main(int argc, char **argv)
progname = argv[0];
progname = argv[0];
- while ((ch = getopt(argc, argv, "s:t:S")) != -1) {
+ while ((ch = getopt(argc, argv, "
v
s:t:S")) != -1) {
switch (ch) {
case 's':
ubus_socket = optarg;
switch (ch) {
case 's':
ubus_socket = optarg;
@@
-231,6
+233,9
@@
int main(int argc, char **argv)
case 'S':
simple_output = true;
break;
case 'S':
simple_output = true;
break;
+ case 'v':
+ verbose++;
+ break;
default:
return usage(progname);
}
default:
return usage(progname);
}