Update proto, clean up server

Signed-off-by: Julian Oes <[email protected]>
mavlink · Aug 21, 2023 · 0012fe4 · 0012fe4
1 parent 3b156ab
commit 0012fe4
Show file tree

Hide file tree

Showing 13 changed files with 173 additions and 2,368 deletions.
diff --git a/proto b/proto
diff --git a/src/mavsdk/core/fs.cpp b/src/mavsdk/core/fs.cpp
@@ -17,6 +17,7 @@
 #include "fs.h"
 #include "filesystem_include.h"
 #include "log.h"
+#include "unused.h"
 
 #ifndef PATH_MAX
 #define PATH_MAX 4096
@@ -26,10 +27,9 @@
 
 namespace mavsdk {
 
-bool fs_exists(const std::string& filename)
+bool fs_exists(const fs::path& path)
 {
-    struct stat buffer;
-    return (stat(filename.c_str(), &buffer) == 0);
+    return fs::exists(path);
 }
 
 uint32_t fs_file_size(const std::string& filename)
@@ -115,10 +115,11 @@ bool fs_create_directory(const std::string& path)
     return (mkdir(path.c_str(), (S_IRWXU | S_IRWXG | S_IRWXO)) == 0);
 }
 
-bool fs_remove(const std::string& path)
+bool fs_remove(const fs::path& path)
 {
-    LogWarn() << "Removing file: " << path;
-    return (remove(path.c_str()) == 0);
+    std::error_code ec;
+    return fs::remove(path, ec);
+    UNUSED(ec);
 }
 
 bool fs_rename(const std::string& old_name, const std::string& new_name)

diff --git a/src/mavsdk/core/fs.h b/src/mavsdk/core/fs.h
@@ -3,6 +3,9 @@
 #include <string>
 #include <optional>
 #include <cstdint>
+#include <filesystem>
+
+namespace fs = std::filesystem;
 
 namespace mavsdk {
 
@@ -12,7 +15,7 @@ const std::string path_separator = "\\";
 const std::string path_separator = "/";
 #endif
 
-bool fs_exists(const std::string& filename);
+bool fs_exists(const fs::path& filename);
 
 uint32_t fs_file_size(const std::string& filename);
 
@@ -22,10 +25,10 @@ std::string fs_canonical(const std::string& path);
 
 bool fs_create_directory(const std::string& path);
 
-bool fs_remove(const std::string& path);
+bool fs_remove(const fs::path& path);
 
 bool fs_rename(const std::string& old_name, const std::string& new_name);
 
 std::optional<std::string> create_tmp_directory(const std::string& prefix);
 
-} // namespace mavsdk
+} // namespace mavsdk