From 90a61b6babe3528efd982511790057e1e1e39b81 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 28 Feb 2015 20:42:50 +0100 Subject: fs/FileInfo: new library providing GetFileInfo() Replaces StatFile(), with a portable data object. --- src/client/ClientFile.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/client') diff --git a/src/client/ClientFile.cxx b/src/client/ClientFile.cxx index 9bf977704..72e9d9931 100644 --- a/src/client/ClientFile.cxx +++ b/src/client/ClientFile.cxx @@ -21,7 +21,7 @@ #include "Client.hxx" #include "protocol/Ack.hxx" #include "fs/Path.hxx" -#include "fs/FileSystem.hxx" +#include "fs/FileInfo.hxx" #include "util/Error.hxx" #include @@ -47,13 +47,11 @@ Client::AllowFile(Path path_fs, Error &error) const return false; } - struct stat st; - if (!StatFile(path_fs, st)) { - error.SetErrno(); + FileInfo fi; + if (!GetFileInfo(path_fs, fi, error)) return false; - } - if (st.st_uid != (uid_t)uid && (st.st_mode & 0444) != 0444) { + if (fi.GetUid() != (uid_t)uid && (fi.GetMode() & 0444) != 0444) { /* client is not owner */ error.Set(ack_domain, ACK_ERROR_PERMISSION, "Access denied"); return false; -- cgit v1.2.3