summaryrefslogtreecommitdiff
path: root/client/main.c
diff options
context:
space:
mode:
authorPatrik Flykt <patrik.flykt@linux.intel.com>2013-02-20 13:53:36 +0200
committerPatrik Flykt <patrik.flykt@linux.intel.com>2013-02-21 16:23:16 +0200
commit499d0573f96511e72d1d217402d42b924de05e78 (patch)
treea1b7d72a5892fe86a5ac4e88d817d5904eaf6438 /client/main.c
parent286c9bf68b3fac70cb88424132a7f8350c5c0170 (diff)
downloadconnman-499d0573f96511e72d1d217402d42b924de05e78.tar.gz
connman-499d0573f96511e72d1d217402d42b924de05e78.tar.bz2
connman-499d0573f96511e72d1d217402d42b924de05e78.zip
client: Remove the now obsolete command parsing functions
Diffstat (limited to 'client/main.c')
-rw-r--r--client/main.c23
1 files changed, 10 insertions, 13 deletions
diff --git a/client/main.c b/client/main.c
index f913534a..31d5a373 100644
--- a/client/main.c
+++ b/client/main.c
@@ -96,23 +96,20 @@ int main(int argc, char *argv[])
show_interactive(connection, main_loop);
error = commands(connection, argv + 1, argc -1);
- if (error == -1) {
- error = commands_no_options(connection, argv + 1, argc - 1);
- if (error == -1) {
- error = commands_options(connection, argv + 1,
- argc - 1);
- if (strcmp(argv[1], "monitor") != 0)
- return error;
- } else {
- return error;
- }
- }
if (error == -1) {
- fprintf(stderr, "%s is not a valid command, check help.\n",
- argv[1]);
+ char *help = "help";
+
+ printf("Usage: connmanctl [[command] [args]]\n");
+ commands(connection, &help, 1);
+ printf("\nNote: arguments and output are considered "
+ "EXPERIMENTAL for now.\n\n");
return -EINVAL;
}
+
+ if (error < 0)
+ return error;
+
gchan = g_io_channel_unix_new(fileno(stdin));
events = G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL;
g_io_add_watch(gchan, events, readmonitor, NULL);