From 0da44b71667d75cadd16349a382dc223c6487d45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beat=20K=C3=BCng?= <beat-kueng@gmx.net>
Date: Tue, 6 Sep 2016 10:39:11 +0200
Subject: [PATCH] posix main: make <data_directory> argument optional, default
to CWD
---
src/platforms/posix/main.cpp | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/platforms/posix/main.cpp b/src/platforms/posix/main.cpp
index e1c32d8a54..e36ff29091 100644
--- a/src/platforms/posix/main.cpp
+++ b/src/platforms/posix/main.cpp
@@ -231,11 +231,11 @@ static void run_cmd(const vector<string> &appargs, bool exit_on_fail, bool silen
static void usage()
{
- cout << "./px4 [-d] data_directory startup_config [-h]" << endl;
+ cout << "./px4 [-d] [data_directory] startup_config [-h]" << endl;
cout << " -d - Optional flag to run the app in daemon mode and does not listen for user input." <<
endl;
cout << " This is needed if px4 is intended to be run as a upstart job on linux" << endl;
- cout << "<data_directory> - directory where romfs and posix-configs are located" << endl;
+ cout << "<data_directory> - directory where ROMFS and posix-configs are located (if not given, CWD is used)" << endl;
cout << "<startup_config> - config file for starting/stopping px4 modules" << endl;
cout << " -h - help/usage information" << endl;
}
@@ -343,23 +343,29 @@ int main(int argc, char **argv)
if (positional_arg_count == 1) {
data_path = argv[index];
- cout << "data path: " << data_path << endl;
} else if (positional_arg_count == 2) {
commands_file = argv[index];
- cout << "commands file: " << commands_file << endl;
}
}
++index;
}
- if (positional_arg_count != 2) {
- PX4_ERR("Error expected 2 position arguments, got %d", positional_arg_count);
+ if (positional_arg_count != 2 && positional_arg_count != 1) {
+ PX4_ERR("Error expected 1 or 2 position arguments, got %d", positional_arg_count);
usage();
return -1;
}
+ if (positional_arg_count == 1) { //data path is optional
+ commands_file = data_path;
+ data_path = ".";
+ }
+
+ cout << "data path: " << data_path << endl;
+ cout << "commands file: " << commands_file << endl;
+
if (commands_file.size() < 1) {
PX4_ERR("Error commands file not specified");
return -1;
--
GitLab