fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-28 04: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/magnetometer/hmc5883/hmc5883.cpp
+13 -3
View File
@@ -73,7 +73,7 @@
#include <uORB/uORB.h>
#include <float.h>
#include <getopt.h>
#include <px4_getopt.h>
#include <lib/conversion/rotation.h>
#include "hmc5883.h"
@@ -1701,7 +1701,11 @@ usage()
int
hmc5883_main(int argc, char *argv[])
{
int myoptind = 1;
int ch;
const char *myoptarg = nullptr;
enum HMC5883_BUS busid = HMC5883_BUS_ALL;
enum Rotation rotation = ROTATION_NONE;
bool calibrate = false;
@@ -1712,7 +1716,7 @@ hmc5883_main(int argc, char *argv[])
exit(0);
}
while ((ch = getopt(argc, argv, "XISR:CT")) != EOF) {
while ((ch = px4_getopt(argc, argv, "XISR:CT", &myoptind, &myoptarg)) != EOF) {
switch (ch) {
case 'R':
rotation = (enum Rotation)atoi(optarg);
@@ -1746,7 +1750,13 @@ hmc5883_main(int argc, char *argv[])
}
}
const char *verb = argv[optind];
if (myoptind >= argc) {
hmc5883::usage();
exit(0);
}
const char *verb = argv[myoptind];
/*
* Start/load the driver.