Skip to content

fix(ftp): List empty directory #23638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2024
Merged

fix(ftp): List empty directory #23638

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions src/modules/mavlink/mavlink_ftp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,17 +399,11 @@ MavlinkFTP::_workList(PayloadHeader *payload)
payload->data[offset++] = kDirentSkip;
*((char *)&payload->data[offset]) = '\0';
offset++;
payload->size = offset;
closedir(dp);
errorCode = kErrFailErrno;

return errorCode;
}

// FIXME: does this ever happen? I would assume readdir always sets errno.
// no more entries?
if (payload->offset != 0 && offset == 0) {
} else if (offset == 0) {
// User is requesting subsequent dir entries but there were none. This means the user asked
// to seek past EOF.
// to seek past EOF. This can happen with `payload->offset == 0` if the directory is empty.
errorCode = kErrEOF;
}

Expand Down