revert

include/drives/fuse/events.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2023> <scott.e.graves@protonmail.com>
+  Copyright <2018-2024> <scott.e.graves@protonmail.com>
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal

include/drives/fuse/fuse_base.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2023> <scott.e.graves@protonmail.com>
+  Copyright <2018-2024> <scott.e.graves@protonmail.com>
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -315,7 +315,7 @@ protected:
     return api_error::not_implemented;
   }
 
-  virtual void destroy_impl(void * /*ptr*/) { return; }
+  virtual void destroy_impl(void * /*ptr*/);
 
   [[nodiscard]] virtual auto
   fallocate_impl(std::string /*api_path*/, int /*mode*/, off_t /*offset*/,

include/drives/fuse/fuse_drive.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2023> <scott.e.graves@protonmail.com>
+  Copyright <2018-2024> <scott.e.graves@protonmail.com>
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -316,9 +316,6 @@ public:
   [[nodiscard]] auto is_processing(const std::string &api_path) const
       -> bool override;
 
-  void populate_stat(const directory_item &dir_item,
-                     struct stat &st) const override;
-
   [[nodiscard]] auto rename_directory(const std::string &from_api_path,
                                       const std::string &to_api_path)
       -> int override;

include/drives/fuse/fuse_drive_base.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2023> <scott.e.graves@protonmail.com>
+  Copyright <2018-2024> <scott.e.graves@protonmail.com>
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal

include/drives/fuse/i_fuse_drive.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2023> <scott.e.graves@protonmail.com>
+  Copyright <2018-2024> <scott.e.graves@protonmail.com>
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -69,9 +69,6 @@ public:
   [[nodiscard]] virtual auto is_processing(const std::string &api_path) const
       -> bool = 0;
 
-  virtual void populate_stat(const directory_item &dir_item,
-                             struct stat &st) const = 0;
-
   [[nodiscard]] virtual auto rename_directory(const std::string &from_api_path,
                                               const std::string &to_api_path)
       -> int = 0;

include/drives/fuse/remotefuse/i_remote_instance.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2023> <scott.e.graves@protonmail.com>
+  Copyright <2018-2024> <scott.e.graves@protonmail.com>
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -57,10 +57,9 @@ public:
      remote::file_offset &length, const remote::file_offset &length, const
      remote::file_handle &handle) = 0;*/
 
-  [[nodiscard]] virtual auto fuse_fgetattr(const char *path, remote::stat &st,
-                                           bool &directory,
-                                           const remote::file_handle &handle)
-      -> packet::error_type = 0;
+  [[nodiscard]] virtual auto
+  fuse_fgetattr(const char *path, remote::stat &r_stat, bool &directory,
+                const remote::file_handle &handle) -> packet::error_type = 0;
 
   [[nodiscard]] virtual auto fuse_fsetattr_x(const char *path,
                                              const remote::setattr_x &attr,
@@ -77,8 +76,8 @@ public:
                                             const remote::file_handle &handle)
       -> packet::error_type = 0;
 
-  [[nodiscard]] virtual auto fuse_getattr(const char *path, remote::stat &st,
-                                          bool &directory)
+  [[nodiscard]] virtual auto fuse_getattr(const char *path,
+                                          remote::stat &r_stat, bool &directory)
       -> packet::error_type = 0;
 
   /*[[nodiscard]] virtual packet::error_type fuse_getxattr(const char *path,
@@ -112,14 +111,14 @@ public:
       -> packet::error_type = 0;
 
   [[nodiscard]] virtual auto fuse_read(const char *path, char *buffer,
-                                       const remote::file_size &readSize,
-                                       const remote::file_offset &readOffset,
+                                       const remote::file_size &read_size,
+                                       const remote::file_offset &read_offset,
                                        const remote::file_handle &handle)
       -> packet::error_type = 0;
 
   [[nodiscard]] virtual auto
   fuse_readdir(const char *path, const remote::file_offset &offset,
-               const remote::file_handle &handle, std::string &itemPath)
+               const remote::file_handle &handle, std::string &item_path)
       -> packet::error_type = 0;
 
   [[nodiscard]] virtual auto fuse_release(const char *path,
@@ -167,11 +166,11 @@ public:
   std::int32_t &flags, std::uint32_t position) = 0;*/
 
   [[nodiscard]] virtual auto fuse_statfs(const char *path, std::uint64_t frsize,
-                                         remote::statfs &st)
+                                         remote::statfs &r_stat)
       -> packet::error_type = 0;
 
   [[nodiscard]] virtual auto
-  fuse_statfs_x(const char *path, std::uint64_t bsize, remote::statfs_x &st)
+  fuse_statfs_x(const char *path, std::uint64_t bsize, remote::statfs_x &r_stat)
       -> packet::error_type = 0;
 
   [[nodiscard]] virtual auto fuse_truncate(const char *path,

include/drives/fuse/remotefuse/remote_client.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2023> <scott.e.graves@protonmail.com>
+  Copyright <2018-2024> <scott.e.graves@protonmail.com>
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal

include/drives/fuse/remotefuse/remote_fuse_drive.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2023> <scott.e.graves@protonmail.com>
+  Copyright <2018-2024> <scott.e.graves@protonmail.com>
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -53,7 +53,8 @@ private:
   bool was_mounted_ = false;
 
 private:
-  void populate_stat(const remote::stat &r, bool directory, struct stat &st);
+  void populate_stat(const remote::stat &r_stat, bool directory,
+                     struct stat &unix_st);
 
 protected:
   [[nodiscard]] auto access_impl(std::string api_path, int mask)
@@ -66,7 +67,7 @@ protected:
 
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] auto chmod_impl(std::string api_path, mode_t mode,
-                                struct fuse_file_info *fi)
+                                struct fuse_file_info *f_info)
       -> api_error override;
 #else
   [[nodiscard]] auto chmod_impl(std::string api_path, mode_t mode)
@@ -75,7 +76,7 @@ protected:
 
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] auto chown_impl(std::string api_path, uid_t uid, gid_t gid,
-                                struct fuse_file_info *fi)
+                                struct fuse_file_info *f_info)
       -> api_error override;
 #else
   [[nodiscard]] auto chown_impl(std::string api_path, uid_t uid, gid_t gid)
@@ -83,37 +84,38 @@ protected:
 #endif
 
   [[nodiscard]] auto create_impl(std::string api_path, mode_t mode,
-                                 struct fuse_file_info *fi)
+                                 struct fuse_file_info *f_info)
       -> api_error override;
+
   void destroy_impl(void * /*ptr*/) override;
 
-  [[nodiscard]] auto fgetattr_impl(std::string api_path, struct stat *st,
-                                   struct fuse_file_info *fi)
+  [[nodiscard]] auto fgetattr_impl(std::string api_path, struct stat *unix_st,
+                                   struct fuse_file_info *f_info)
       -> api_error override;
 
 #ifdef __APPLE__
   [[nodiscard]] auto fsetattr_x_impl(std::string api_path,
                                      struct setattr_x *attr,
-                                     struct fuse_file_info *fi)
+                                     struct fuse_file_info *f_info)
       -> api_error override;
 #endif // __APPLE__
 
   [[nodiscard]] auto fsync_impl(std::string api_path, int datasync,
-                                struct fuse_file_info *fi)
+                                struct fuse_file_info *f_info)
       -> api_error override;
 
 #if FUSE_USE_VERSION < 30
   [[nodiscard]] auto ftruncate_impl(std::string api_path, off_t size,
-                                    struct fuse_file_info *fi)
+                                    struct fuse_file_info *f_info)
       -> api_error override;
 #endif
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] auto getattr_impl(std::string api_path, struct stat *st,
-                                  struct fuse_file_info *fi)
+  [[nodiscard]] auto getattr_impl(std::string api_path, struct stat *unix_st,
+                                  struct fuse_file_info *f_info)
       -> api_error override;
 #else
-  [[nodiscard]] auto getattr_impl(std::string api_path, struct stat *st)
+  [[nodiscard]] auto getattr_impl(std::string api_path, struct stat *unix_st)
       -> api_error override;
 #endif
 
@@ -136,37 +138,38 @@ protected:
 
   void notify_fuse_main_exit(int &ret) override;
 
-  [[nodiscard]] auto open_impl(std::string api_path, struct fuse_file_info *fi)
+  [[nodiscard]] auto open_impl(std::string api_path,
+                               struct fuse_file_info *f_info)
       -> api_error override;
 
   [[nodiscard]] auto opendir_impl(std::string api_path,
-                                  struct fuse_file_info *fi)
+                                  struct fuse_file_info *f_info)
       -> api_error override;
 
   [[nodiscard]] auto read_impl(std::string api_path, char *buffer,
                                size_t read_size, off_t read_offset,
-                               struct fuse_file_info *fi,
+                               struct fuse_file_info *f_info,
                                std::size_t &bytes_read) -> api_error override;
 
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] auto readdir_impl(std::string api_path, void *buf,
                                   fuse_fill_dir_t fuse_fill_dir, off_t offset,
-                                  struct fuse_file_info *fi,
+                                  struct fuse_file_info *f_info,
                                   fuse_readdir_flags flags)
       -> api_error override;
 #else
   [[nodiscard]] auto readdir_impl(std::string api_path, void *buf,
                                   fuse_fill_dir_t fuse_fill_dir, off_t offset,
-                                  struct fuse_file_info *fi)
+                                  struct fuse_file_info *f_info)
       -> api_error override;
 #endif
 
   [[nodiscard]] auto release_impl(std::string api_path,
-                                  struct fuse_file_info *fi)
+                                  struct fuse_file_info *f_info)
       -> api_error override;
 
   [[nodiscard]] auto releasedir_impl(std::string api_path,
-                                     struct fuse_file_info *fi)
+                                     struct fuse_file_info *f_info)
       -> api_error override;
 
 #if FUSE_USE_VERSION >= 30
@@ -210,7 +213,7 @@ protected:
 
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] auto truncate_impl(std::string api_path, off_t size,
-                                   struct fuse_file_info *fi)
+                                   struct fuse_file_info *f_info)
       -> api_error override;
 #else
   [[nodiscard]] auto truncate_impl(std::string api_path, off_t size)
@@ -222,7 +225,7 @@ protected:
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] auto utimens_impl(std::string api_path,
                                   const struct timespec tv[2],
-                                  struct fuse_file_info *fi)
+                                  struct fuse_file_info *f_info)
       -> api_error override;
 #else
   [[nodiscard]] auto utimens_impl(std::string api_path,
@@ -232,7 +235,7 @@ protected:
 
   [[nodiscard]] auto write_impl(std::string api_path, const char *buffer,
                                 size_t write_size, off_t write_offset,
-                                struct fuse_file_info *fi,
+                                struct fuse_file_info *f_info,
                                 std::size_t &bytes_written)
       -> api_error override;
 };

include/drives/fuse/remotefuse/remote_server.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2023> <scott.e.graves@protonmail.com>
+  Copyright <2018-2024> <scott.e.graves@protonmail.com>
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -54,7 +54,7 @@ private:
                           const UINT32 &attributes,
                           remote::file_info &file_info);
 
-  static void populate_stat(const struct stat64 &st1, remote::stat &st);
+  static void populate_stat(const struct stat64 &unix_st, remote::stat &r_stat);
 
   [[nodiscard]] auto update_to_windows_format(json &item) -> json &;
 
@@ -88,7 +88,7 @@ public:
      remote::file_offset &length, const remote::file_handle &handle) override
      ;*/
 
-  [[nodiscard]] auto fuse_fgetattr(const char *path, remote::stat &st,
+  [[nodiscard]] auto fuse_fgetattr(const char *path, remote::stat &r_stat,
                                    bool &directory,
                                    const remote::file_handle &handle)
       -> packet::error_type override;
@@ -107,7 +107,7 @@ public:
                                     const remote::file_handle &handle)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_getattr(const char *path, remote::stat &st,
+  [[nodiscard]] auto fuse_getattr(const char *path, remote::stat &r_stat,
                                   bool &directory)
       -> packet::error_type override;
 
@@ -196,11 +196,11 @@ public:
   std::int32_t &flags, std::uint32_t position) override ;*/
 
   [[nodiscard]] auto fuse_statfs(const char *path, std::uint64_t frsize,
-                                 remote::statfs &st)
+                                 remote::statfs &r_stat)
       -> packet::error_type override;
 
   [[nodiscard]] auto fuse_statfs_x(const char *path, std::uint64_t bsize,
-                                   remote::statfs_x &st)
+                                   remote::statfs_x &r_stat)
       -> packet::error_type override;
 
   [[nodiscard]] auto fuse_truncate(const char *path,