From 77bd36aa334a602ed7e4cd225a8e4c7598048a64 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sun, 24 May 2015 10:40:52 -0700 Subject: [PATCH] Fix opendir failure handling --- src/modules/mavlink/mavlink_ftp.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/modules/mavlink/mavlink_ftp.cpp b/src/modules/mavlink/mavlink_ftp.cpp index 233bc2d323..42cabb4ba6 100644 --- a/src/modules/mavlink/mavlink_ftp.cpp +++ b/src/modules/mavlink/mavlink_ftp.cpp @@ -316,14 +316,8 @@ MavlinkFTP::_workList(PayloadHeader* payload) _mavlink->send_statustext_critical("FTP: can't open path (file system corrupted?)"); _mavlink->send_statustext_critical(dirPath); #endif - // this is not an FTP error, abort directory read and continue - - payload->data[offset++] = kDirentSkip; - *((char *)&payload->data[offset]) = '\0'; - offset++; - payload->size = offset; - - return errorCode; + // this is not an FTP error, abort directory by simulating eof + return kErrEOF; } #ifdef MAVLINK_FTP_DEBUG