Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_SITL: work around bug in dash 

dash doesn't search the path for scripts, so allow user to specify path to ArduPilot scripts
This commit is contained in:
Peter Barker 2024-08-03 11:52:43 +10:00 committed by Andrew Tridgell
parent 1f01f75036
commit b6426516b8
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/AP_HAL_SITL/system.cpp
View File

@ -65,13 +65,24 @@ static void run_command_on_ownpid(const char *commandname)
// find dumpstack command: // find dumpstack command:
const char *command_filepath = commandname; // if we can't find it trust in PATH const char *command_filepath = commandname; // if we can't find it trust in PATH
struct stat statbuf; struct stat statbuf;
const char *custom_scripts_dir_path = getenv("AP_SCRIPTS_DIR_PATH");
char *custom_scripts_dir_path_pattern = nullptr;
if (custom_scripts_dir_path != nullptr) {
if (asprintf(&custom_scripts_dir_path_pattern, "%s/%%s", custom_scripts_dir_path) == -1) {
custom_scripts_dir_path_pattern = nullptr;
}
}
const char *paths[] { const char *paths[] {
custom_scripts_dir_path_pattern,
"Tools/scripts/%s", "Tools/scripts/%s",
"APM/Tools/scripts/%s", // for autotest server "APM/Tools/scripts/%s", // for autotest server
"../Tools/scripts/%s", // when run from e.g. ArduCopter subdirectory "../Tools/scripts/%s", // when run from e.g. ArduCopter subdirectory
}; };
char buffer[60]; char buffer[60];
for (uint8_t i=0; i<ARRAY_SIZE(paths); i++) { for (uint8_t i=0; i<ARRAY_SIZE(paths); i++) {
if (paths[i] == nullptr) {
continue;
}
// form up a filepath from each path and commandname; if it // form up a filepath from each path and commandname; if it
// exists, use it // exists, use it
snprintf(buffer, sizeof(buffer), paths[i], commandname); snprintf(buffer, sizeof(buffer), paths[i], commandname);
@ -80,6 +91,7 @@ static void run_command_on_ownpid(const char *commandname)
break; break;
} }
} }
free(custom_scripts_dir_path_pattern);
char progname[100]; char progname[100];
int n = readlink("/proc/self/exe", progname, sizeof(progname)-1); int n = readlink("/proc/self/exe", progname, sizeof(progname)-1);