fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 22:13:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

MAVLink FTP: Do not list hidden directories by default

Browse Source
This commit is contained in:
Lorenz Meier
2015-06-06 11:35:29 +02:00
parent 9af8ba49ac
commit 3e0c14dea2
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_ftp.cpp
+3 -2
View File
@@ -299,7 +299,7 @@ MavlinkFTP::_reply(mavlink_file_transfer_protocol_t* ftp_req)
/// @brief Responds to a List command /// @brief Responds to a List command
MavlinkFTP::ErrorCode MavlinkFTP::ErrorCode
MavlinkFTP::_workList(PayloadHeader* payload) MavlinkFTP::_workList(PayloadHeader* payload, bool list_hidden)
{ {
char dirPath[kMaxDataLength]; char dirPath[kMaxDataLength];
strncpy(dirPath, _data_as_cstring(payload), kMaxDataLength); strncpy(dirPath, _data_as_cstring(payload), kMaxDataLength);
@@ -375,7 +375,8 @@ MavlinkFTP::_workList(PayloadHeader* payload)
} }
break; break;
case DTYPE_DIRECTORY: case DTYPE_DIRECTORY:
if (strcmp(entry.d_name, ".") == 0 || strcmp(entry.d_name, "..") == 0) { if ((!list_hidden && (strncmp(entry.d_name, ".", 1) == 0)) ||
strcmp(entry.d_name, ".") == 0 || strcmp(entry.d_name, "..") == 0) {
// Don't bother sending these back // Don't bother sending these back
direntType = kDirentSkip; direntType = kDirentSkip;
} else { } else {
src/modules/mavlink/mavlink_ftp.h
+1 -1
View File
@@ -130,7 +130,7 @@ private:
void _reply(mavlink_file_transfer_protocol_t* ftp_req); void _reply(mavlink_file_transfer_protocol_t* ftp_req);
int _copy_file(const char *src_path, const char *dst_path, size_t length); int _copy_file(const char *src_path, const char *dst_path, size_t length);
ErrorCode _workList(PayloadHeader *payload); ErrorCode _workList(PayloadHeader *payload, bool list_hidden = false);
ErrorCode _workOpen(PayloadHeader *payload, int oflag); ErrorCode _workOpen(PayloadHeader *payload, int oflag);
ErrorCode _workRead(PayloadHeader *payload); ErrorCode _workRead(PayloadHeader *payload);
ErrorCode _workBurst(PayloadHeader* payload, uint8_t target_system_id); ErrorCode _workBurst(PayloadHeader* payload, uint8_t target_system_id);