diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-18 12:04:07 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-18 12:04:07 +0200 |
| commit | e597f979824074e971aef19814951d87c8b6a8b5 (patch) | |
| tree | 3b4c767b37c2799a75074d287d66ba31918e32e7 /src/drivers/rgbled/rgbled.cpp | |
| parent | eda528157a04185cbb1342c152c4ac715f67771c (diff) | |
| parent | 061be7f7fed430d1c235809f1e1dce61e8b7aa01 (diff) | |
| download | px4-firmware-e597f979824074e971aef19814951d87c8b6a8b5.tar.gz px4-firmware-e597f979824074e971aef19814951d87c8b6a8b5.tar.bz2 px4-firmware-e597f979824074e971aef19814951d87c8b6a8b5.zip | |
Merged master
Diffstat (limited to 'src/drivers/rgbled/rgbled.cpp')
| -rw-r--r-- | src/drivers/rgbled/rgbled.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/drivers/rgbled/rgbled.cpp b/src/drivers/rgbled/rgbled.cpp index f2543a33c..467379a77 100644 --- a/src/drivers/rgbled/rgbled.cpp +++ b/src/drivers/rgbled/rgbled.cpp @@ -456,7 +456,8 @@ rgbled_main(int argc, char *argv[]) int rgbledadr = ADDR; /* 7bit */ int ch; - while ((ch = getopt(argc, argv, "a:b:")) != EOF) { + /* jump over start/off/etc and look at options first */ + while ((ch = getopt(argc-1, &argv[1], "a:b:")) != EOF) { switch (ch) { case 'a': rgbledadr = strtol(optarg, NULL, 0); @@ -468,9 +469,8 @@ rgbled_main(int argc, char *argv[]) rgbled_usage(); } } - argc -= optind; - argv += optind; - const char *verb = argv[0]; + + const char *verb = argv[1]; int fd; int ret; @@ -549,7 +549,7 @@ rgbled_main(int argc, char *argv[]) if (fd == -1) { errx(1, "Unable to open " RGBLED_DEVICE_PATH); } - if (argc < 4) { + if (argc < 5) { errx(1, "Usage: rgbled rgb <red> <green> <blue>"); } rgbled_rgbset_t v; |