aboutsummaryrefslogtreecommitdiff
path: root/apps/mavlink/mavlink.c
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2012-11-08 18:09:13 +0100
committerLorenz Meier <lm@inf.ethz.ch>2012-11-08 18:09:13 +0100
commit1da7fc2549a9ef18c81de8cd39b5743a8a28eb0b (patch)
tree57cbb0f085f522e7ea85911c323e39b056fcda39 /apps/mavlink/mavlink.c
parentff3a014971f83f15f4884e584a2f58ee979f23ee (diff)
downloadpx4-firmware-1da7fc2549a9ef18c81de8cd39b5743a8a28eb0b.tar.gz
px4-firmware-1da7fc2549a9ef18c81de8cd39b5743a8a28eb0b.tar.bz2
px4-firmware-1da7fc2549a9ef18c81de8cd39b5743a8a28eb0b.zip
Improved commandline handling
Diffstat (limited to 'apps/mavlink/mavlink.c')
-rw-r--r--apps/mavlink/mavlink.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/apps/mavlink/mavlink.c b/apps/mavlink/mavlink.c
index 9b2cfcbba..9c39b2714 100644
--- a/apps/mavlink/mavlink.c
+++ b/apps/mavlink/mavlink.c
@@ -714,7 +714,7 @@ int mavlink_thread_main(int argc, char *argv[])
static void
usage()
{
- fprintf(stderr, "usage: mavlink start [-d <devicename>] [-b <baud rate>] [-e] [-o]\n"
+ fprintf(stderr, "usage: mavlink start [-d <devicename>] [-b <baud rate>]\n"
" mavlink stop\n"
" mavlink status\n");
exit(1);
@@ -723,8 +723,10 @@ usage()
int mavlink_main(int argc, char *argv[])
{
- if (argc < 1)
- errx(1, "missing command");
+ if (argc < 2) {
+ warnx("missing command");
+ usage();
+ }
if (!strcmp(argv[1], "start")) {
@@ -759,6 +761,9 @@ int mavlink_main(int argc, char *argv[])
}
}
- errx(1, "unrecognized command");
+ warnx("unrecognized command");
+ usage();
+ /* not getting here */
+ return 0;
}