debian-packages/vibe-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Let openFile throw on failure instead of returning an invalid stream.

Browse source
This commit is contained in:
Sönke Ludwig 2017-05-30 10:57:31 +02:00
parent 52ead0891f
commit 0aed5664ef
No known key found for this signature in database
GPG key ID: D95E8DB493EE314C
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/vibe/core/file.d
View file

@ -37,7 +37,9 @@ version(Posix){
*/ */
FileStream openFile(Path path, FileMode mode = FileMode.read) FileStream openFile(Path path, FileMode mode = FileMode.read)
{ {
return FileStream(eventDriver.files.open(path.toNativeString(), cast(FileOpenMode)mode), path, mode); auto fil = eventDriver.files.open(path.toNativeString(), cast(FileOpenMode)mode);
enforce(fil != FileFD.invalid, "Failed to open file '"~path.toNativeString~"'");
return FileStream(fil, path, mode);
} }
/// ditto /// ditto
FileStream openFile(string path, FileMode mode = FileMode.read) FileStream openFile(string path, FileMode mode = FileMode.read)
@ -393,8 +395,9 @@ struct FileStream {
CTX* m_ctx; CTX* m_ctx;
} }
this(FileFD fd, Path path, FileMode mode) private this(FileFD fd, Path path, FileMode mode)
{ {
assert(fd != FileFD.invalid, "Constructing FileStream from invalid file descriptor.");
m_fd = fd; m_fd = fd;
m_ctx = new CTX; // TODO: use FD custom storage m_ctx = new CTX; // TODO: use FD custom storage
m_ctx.path = path; m_ctx.path = path;