dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Mavlink FTP - return ENOENT when directory doesn't exist (#12589)

This commit is contained in:
Matej Frančeškin 2019-07-31 15:22:46 +02:00 committed by Beat Küng
parent eaaf66e46b
commit 1600b0fd82
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/mavlink/mavlink_ftp.cpp
View File

@ -275,7 +275,6 @@ out:
payload->data[0] = errorCode;
if (errorCode == kErrFailErrno) {
payload->size = 2;
payload->data[1] = r_errno;
@ -353,14 +352,10 @@ MavlinkFTP::_workList(PayloadHeader *payload, bool list_hidden)
DIR *dp = opendir(_work_buffer1);
if (dp == nullptr) {
#ifdef MAVLINK_FTP_UNIT_TEST
PX4_WARN("File open failed %s", _work_buffer1);
#else
_mavlink->send_statustext_critical("FTP: can't open path (file system corrupted?)");
_mavlink->send_statustext_critical(_work_buffer1);
#endif
// this is not an FTP error, abort directory by simulating eof
return kErrEOF;
// this is not an FTP error, abort directory by setting errno to ENOENT "No such file or directory"
errno = ENOENT;
return kErrFailErrno;
}
#ifdef MAVLINK_FTP_DEBUG
@ -381,13 +376,7 @@ MavlinkFTP::_workList(PayloadHeader *payload, bool list_hidden)
// read the directory entry
if (result == nullptr) {
if (errno) {
#ifdef MAVLINK_FTP_UNIT_TEST
PX4_WARN("readdir failed");
#else
_mavlink->send_statustext_critical("FTP: list readdir failure");
_mavlink->send_statustext_critical(_work_buffer1);
#endif
payload->data[offset++] = kDirentSkip;
*((char *)&payload->data[offset]) = '\0';
offset++;