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

Uodated to 20150527 Read GetInfo changes

Browse Source
This commit is contained in:
David Sidrane
2015-05-30 08:00:02 -10:00
parent 81512cc2e7
commit cf32ca0573
1 changed files with 21 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan_drivers/posix/include/uavcan_posix/basic_file_server_backend.hpp
+21 -44
View File
@@ -320,62 +320,39 @@ protected:
* Implementation of this method is required. * Implementation of this method is required.
* On success the method must return zero. * On success the method must return zero.
*/ */
virtual int16_t getInfo(const Path& path, uint64_t& out_crc64, uint32_t& out_size, EntryType& out_type) virtual int16_t getInfo(const Path& path, uint64_t& out_size, EntryType& out_type)
{ {
int rv = uavcan::protocol::file::Error::INVALID_VALUE; int rv = uavcan::protocol::file::Error::INVALID_VALUE;
FileCRC crc;
if (path.size() > 0) if (path.size() > 0)
{ {
using namespace std; using namespace std;
out_size = 0;
out_crc64 = 0;
rv = -ENOENT; struct stat sb;
uint8_t buffer[512];
int fd = ::open(path.c_str(), O_RDONLY); rv = stat(path.c_str(), &sb);
if (fd >= 0) if (rv < 0)
{
rv = errno;
}
else
{ {
int len = 0;
do
{
len = ::read(fd, buffer, sizeof(buffer));
if (len > 0)
{
out_size += len;
crc.add(buffer, len);
}
else if (len < 0)
{
rv = EIO;
goto out_close;
}
}
while(len > 0);
out_crc64 = crc.get();
// We can assume the path is to a file and the file is readable.
out_type.flags = uavcan::protocol::file::EntryType::FLAG_READABLE |
uavcan::protocol::file::EntryType::FLAG_FILE;
// TODO Using fixed flag FLAG_READABLE until we add file permission checks to return actual value.
// TODO Check whether the object pointed by path is a file or a directory
// On could ad call to stat() to determine if the path is to a file or a directory but the
// what are the return parameters in this case?
rv = 0; rv = 0;
out_close: out_size = sb.st_size;
(void)::close(fd); out_type.flags = uavcan::protocol::file::EntryType::FLAG_READABLE;
if (S_ISDIR(sb.st_mode))
{
out_type.flags |= uavcan::protocol::file::EntryType::FLAG_DIRECTORY;
}
else if (S_ISREG(sb.st_mode))
{
out_type.flags |= uavcan::protocol::file::EntryType::FLAG_FILE;
}
// TODO Using fixed flag FLAG_READABLE until we add file permission checks to return actual value.
} }
} }
return rv; return rv;
@@ -388,7 +365,7 @@ protected:
* if the end of file is reached. * if the end of file is reached.
* On success the method must return zero. * On success the method must return zero.
*/ */
virtual int16_t read(const Path& path, const uint32_t offset, uint8_t* out_buffer, uint16_t& inout_size) virtual int16_t read(const Path& path, const uint64_t offset, uint8_t* out_buffer, uint16_t& inout_size)
{ {
int rv = uavcan::protocol::file::Error::INVALID_VALUE; int rv = uavcan::protocol::file::Error::INVALID_VALUE;