From 082ef85773580b84789898b74ca96f0450ad61a7 Mon Sep 17 00:00:00 2001
From: Bob-F <38539206+UAV-Pilot@users.noreply.github.com>
Date: Tue, 31 Jul 2018 20:41:40 -0700
Subject: [PATCH] handled a document issue and the case of absent test_data
 directory

---
 platforms/posix/src/main.cpp         | 11 +++--------
 src/modules/mavlink/mavlink_main.cpp |  3 +--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/platforms/posix/src/main.cpp b/platforms/posix/src/main.cpp
index 04b419bd91..a9fcbd6aa9 100644
--- a/platforms/posix/src/main.cpp
+++ b/platforms/posix/src/main.cpp
@@ -335,10 +335,8 @@ int main(int argc, char **argv)
 	string data_path;
 	string node_name;
 
-	bool skippingOutputRedirect = false;
-
 	// parse arguments
-	while (index < argc && !skippingOutputRedirect) {
+	while (index < argc) {
 		//cout << "arg: " << index << " : " << argv[index] << endl;
 
 		if (argv[index][0] == '-') {
@@ -368,9 +366,6 @@ int main(int argc, char **argv)
 				cout << "node name: " << node_name << endl;
 			}
 
-		} else if (strchr(argv[index], '>')) {
-			skippingOutputRedirect = true;
-
 		} else {
 			//cout << "positional argument" << endl;
 
@@ -420,7 +415,7 @@ int main(int argc, char **argv)
 		vector<string> path_sym_links;
 		path_sym_links.push_back("ROMFS");
 		path_sym_links.push_back("posix-configs");
-		path_sym_links.push_back("test_data");
+		path_sym_links.push_back("test_data");  // optional
 
 		for (unsigned i = 0; i < path_sym_links.size(); i++) {
 			string path_sym_link = path_sym_links[i];
@@ -430,7 +425,7 @@ int main(int argc, char **argv)
 
 			PX4_DEBUG("Creating symlink %s -> %s", src_path.c_str(), dest_path.c_str());
 
-			if (dirExists(path_sym_link)) { continue; }
+			if (dirExists(path_sym_link) || !dirExists(dest_path)) { continue; }
 
 			// create sym-links
 			int ret = symlink(src_path.c_str(), dest_path.c_str());
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp
index 565a57ca97..a82a58fbcd 100644
--- a/src/modules/mavlink/mavlink_main.cpp
+++ b/src/modules/mavlink/mavlink_main.cpp
@@ -3023,8 +3023,7 @@ $ mavlink stream -u 14556 -s HIGHRES_IMU -r 50
 #endif
 	PRINT_MODULE_USAGE_PARAM_STRING('m', "normal", "custom|camera|onboard|osd|magic|config|iridium|minimal",
 					"Mode: sets default streams and rates", true);
-	PRINT_MODULE_USAGE_PARAM_STRING('n', "SoftAp", "SoftAp|wlan|name of custom wifi interface",
-					"wifi interface name", true);
+	PRINT_MODULE_USAGE_PARAM_STRING('n', nullptr, "<interface_name>", "wifi/ethernet interface name", true);
 	PRINT_MODULE_USAGE_PARAM_FLAG('f', "Enable message forwarding to other Mavlink instances", true);
 	PRINT_MODULE_USAGE_PARAM_FLAG('w', "Wait to send, until first message received", true);
 	PRINT_MODULE_USAGE_PARAM_FLAG('x', "Enable FTP", true);