jeanlemotan/FS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed crash on enumerate + rvalue

Browse Source
This commit is contained in:
catalinvasile
2024-07-11 17:57:31 +02:00
parent 28b74b4056
commit 5ec1fddf57
10 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/fs/CustomFilesystem.h
+2 -2
View File
@@ -64,8 +64,8 @@ public:
GetStatResult getStat(AbsPathView path) const override;
cppcoro::generator<EnumerateEntry> enumerate(AbsPathView path) const override;
cppcoro::generator<EnumerateEntry> enumerateRecursively(AbsPathView path) const override;
cppcoro::generator<EnumerateEntry> enumerate(AbsPath path) const override;
cppcoro::generator<EnumerateEntry> enumerateRecursively(AbsPath path) const override;
private:
struct PackData
include/fs/FolderPack.h
+2 -2
View File
@@ -25,8 +25,8 @@ public:
GetStatResult getStat(AbsPathView path) const override;
cppcoro::generator<EnumerateEntry> enumerate(AbsPathView path) const override;
cppcoro::generator<EnumerateEntry> enumerateRecursively(AbsPathView path) const override;
cppcoro::generator<EnumerateEntry> enumerate(AbsPath path) const override;
cppcoro::generator<EnumerateEntry> enumerateRecursively(AbsPath path) const override;
ConvertToNativePathResult convertToNativePath(AbsPathView path) const override;
include/fs/IFilesystem.h
+6 -2
View File
@@ -117,8 +117,12 @@ public:
virtual SetWriteTimeResult setWriteTime(AbsPathView path, time_t time) = 0;
virtual cppcoro::generator<EnumerateEntry> enumerate(AbsPathView path) const = 0;
virtual cppcoro::generator<EnumerateEntry> enumerateRecursively(AbsPathView path) const = 0;
//The AbsPath is a copy, because there are lifetime subtleties when using coroutines.
//In particular, without pass-by-value, this would crash because nobody is storing the rvalue:
// for (auto e: fs.enumerate(path + "other folder"))
// {}
virtual cppcoro::generator<EnumerateEntry> enumerate(AbsPath path) const = 0;
virtual cppcoro::generator<EnumerateEntry> enumerateRecursively(AbsPath path) const = 0;
};
include/fs/IPack.h
+2 -2
View File
@@ -33,8 +33,8 @@ public:
virtual GetStatResult getStat(AbsPathView i_path) const = 0;
virtual cppcoro::generator<EnumerateEntry> enumerate(AbsPathView i_path) const = 0;
virtual cppcoro::generator<EnumerateEntry> enumerateRecursively(AbsPathView i_path) const = 0;
virtual cppcoro::generator<EnumerateEntry> enumerate(AbsPath i_path) const = 0;
virtual cppcoro::generator<EnumerateEntry> enumerateRecursively(AbsPath i_path) const = 0;
virtual ConvertToNativePathResult convertToNativePath(AbsPathView i_path) const = 0;
include/fs/NativeFilesystem.h
+2 -2
View File
@@ -50,8 +50,8 @@ public:
GetStatResult getStat(AbsPathView path) const override;
cppcoro::generator<EnumerateEntry> enumerate(AbsPathView path) const override;
cppcoro::generator<EnumerateEntry> enumerateRecursively(AbsPathView path) const override;
cppcoro::generator<EnumerateEntry> enumerate(AbsPath path) const override;
cppcoro::generator<EnumerateEntry> enumerateRecursively(AbsPath path) const override;
AbsPath getCurrentFolder() const;
tl::result<Error> setCurrentFolder(AbsPathView path);
include/fs/zip/ZipPack.h
+2 -2
View File
@@ -37,8 +37,8 @@ public:
GetStatResult getStat(AbsPathView path) const override;
cppcoro::generator<EnumerateEntry> enumerate(AbsPathView path) const override;
cppcoro::generator<EnumerateEntry> enumerateRecursively(AbsPathView path) const override;
cppcoro::generator<EnumerateEntry> enumerate(AbsPath path) const override;
cppcoro::generator<EnumerateEntry> enumerateRecursively(AbsPath path) const override;
tl::result<AbsPath, Error> convertToNativePath(AbsPathView path) const override;