X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ffs%2Fstat.cpp;h=d61081b95c9190732627c2e435223eb8f61ba73a;hb=e297edc38785ae5931685f6b1d6efdef97fc5c10;hp=d11867d99b6af41a427dba423673acc622390a65;hpb=e14321c38b34ec1cc5641b267f031693a8f7bc27;p=libs%2Fcore.git

diff --git a/source/fs/stat.cpp b/source/fs/stat.cpp
index d11867d..d61081b 100644
--- a/source/fs/stat.cpp
+++ b/source/fs/stat.cpp
@@ -3,6 +3,8 @@
 #include <aclapi.h>
 #else
 #define _FILE_OFFSET_BITS 64
+#include <cerrno>
+#include <unistd.h>
 #include <sys/stat.h>
 #include <grp.h>
 #include <pwd.h>
@@ -46,6 +48,7 @@ struct Stat::Private
 Stat Stat::Private::from_struct_stat(const struct stat &st)
 {
 	Stat result;
+	result.exists = true;
 	if(S_ISREG(st.st_mode))
 		result.type = REGULAR;
 	else if(S_ISDIR(st.st_mode))
@@ -79,6 +82,7 @@ Stat Stat::Private::from_struct_stat(const struct stat &st)
 #endif
 
 Stat::Stat():
+	exists(false),
 	type(UNKNOWN),
 	size(0),
 	alloc_size(0)
@@ -90,7 +94,13 @@ Stat Stat::stat(const Path &path)
 	HANDLE handle;
 	handle = CreateFile(path.str().c_str(), 0, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);
 	if(handle==INVALID_HANDLE_VALUE)
-		throw system_error("CreateFile");
+	{
+		DWORD err = GetLastError();
+		if(err==ERROR_FILE_NOT_FOUND)
+			return Stat();
+		else
+			throw system_error("CreateFile", err);
+	}
 
 	BY_HANDLE_FILE_INFORMATION info;
 	if(!GetFileInformationByHandle(handle, &info))
@@ -132,7 +142,12 @@ Stat Stat::stat(const Path &path)
 	struct stat st;
 	int ret = ::stat(path.str().c_str(), &st);
 	if(ret==-1)
-		throw system_error("stat");
+	{
+		if(errno==ENOENT)
+			return Stat();
+		else
+			throw system_error("stat");
+	}
 
 	return Private::from_struct_stat(st);
 #endif
@@ -146,7 +161,12 @@ Stat Stat::lstat(const Path &path)
 	struct stat st;
 	int ret = ::lstat(path.str().c_str(), &st);
 	if(ret==-1)
-		throw system_error("lstat");
+	{
+		if(errno==ENOENT)
+			return Stat();
+		else
+			throw system_error("lstat");
+	}
 
 	return Private::from_struct_stat(st);
 #endif