fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-26 06:53:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

using only px4_getopt() and never the unsafe getopt()

Browse Source 
using only <px4_getopt.h> as include, cleanup related includes
added check that all the option are valid (myoptind >= argc). if there are invalid options on some script that might now lead not to run commands
This commit is contained in:
bazooka joe
2019-02-21 09:45:45 +01:00
committed by Beat Küng
parent 3db901b238
commit 922c19aa9c
20 changed files with 131 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/lights/rgbled_pwm/rgbled_pwm.cpp
+9 -4
View File
@@ -52,6 +52,7 @@
#include <unistd.h>
#include <stdio.h>
#include <ctype.h>
#include <px4_getopt.h>
#include <nuttx/wqueue.h>
#include <drivers/drv_hrt.h>
@@ -293,10 +294,13 @@ rgbled_usage()
int
rgbled_pwm_main(int argc, char *argv[])
{
int myoptind = 1;
int ch;
const char *myoptarg = nullptr;
/* jump over start/off/etc and look at options first */
while ((ch = getopt(argc, argv, "a:b:")) != EOF) {
while ((ch = px4_getopt(argc, argv, "a:b:", &myoptind, &myoptarg)) != EOF) {
switch (ch) {
case 'a':
break;
@@ -310,12 +314,13 @@ rgbled_pwm_main(int argc, char *argv[])
}
}
if (optind >= argc) {
if (myoptind >= argc) {
rgbled_usage();
exit(1);
exit(0);
}
const char *verb = argv[optind];
const char *verb = argv[myoptind];
if (!strcmp(verb, "start")) {
if (g_rgbled != nullptr) {