From 4b8658a318a370bfdec06120cecd84a568346dfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beat=20K=C3=BCng?= <beat-kueng@gmx.net>
Date: Mon, 4 Jun 2018 14:24:48 +0200
Subject: [PATCH] ms5525: add argc check and use px4_getopt

---
 .../ms5525/MS5525_main.cpp                    | 34 +++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/drivers/differential_pressure/ms5525/MS5525_main.cpp b/src/drivers/differential_pressure/ms5525/MS5525_main.cpp
index 420fe7453e..5f17707791 100644
--- a/src/drivers/differential_pressure/ms5525/MS5525_main.cpp
+++ b/src/drivers/differential_pressure/ms5525/MS5525_main.cpp
@@ -33,6 +33,8 @@
 
 #include "MS5525.hpp"
 
+#include <px4_getopt.h>
+
 // Driver 'main' command.
 extern "C" __EXPORT int ms5525_airspeed_main(int argc, char *argv[]);
 
@@ -151,36 +153,48 @@ ms5525_airspeed_main(int argc, char *argv[])
 {
 	uint8_t i2c_bus = PX4_I2C_BUS_DEFAULT;
 
-	for (int i = 1; i < argc; i++) {
-		if (strcmp(argv[i], "-b") == 0 || strcmp(argv[i], "--bus") == 0) {
-			if (argc > i + 1) {
-				i2c_bus = atoi(argv[i + 1]);
-			}
+	int myoptind = 1;
+	int ch;
+	const char *myoptarg = nullptr;
+
+	while ((ch = px4_getopt(argc, argv, "b:", &myoptind, &myoptarg)) != EOF) {
+		switch (ch) {
+		case 'b':
+			i2c_bus = atoi(myoptarg);
+			break;
+
+		default:
+			ms5525_airspeed_usage();
+			return 0;
 		}
 	}
 
+	if (myoptind >= argc) {
+		ms5525_airspeed_usage();
+		return -1;
+	}
+
 	/*
 	 * Start/load the driver.
 	 */
-	if (!strcmp(argv[1], "start")) {
+	if (!strcmp(argv[myoptind], "start")) {
 		return ms5525_airspeed::start(i2c_bus);
 	}
 
 	/*
 	 * Stop the driver
 	 */
-	if (!strcmp(argv[1], "stop")) {
+	if (!strcmp(argv[myoptind], "stop")) {
 		return ms5525_airspeed::stop();
 	}
 
 	/*
 	 * Reset the driver.
 	 */
-	if (!strcmp(argv[1], "reset")) {
+	if (!strcmp(argv[myoptind], "reset")) {
 		return ms5525_airspeed::reset();
 	}
 
 	ms5525_airspeed_usage();
-
-	return PX4_OK;
+	return 0;
 }