fs/FileInfo: new library providing GetFileInfo()
Replaces StatFile(), with a portable data object.
This commit is contained in:
@@ -21,7 +21,7 @@
|
||||
#include "CheckFile.hxx"
|
||||
#include "Log.hxx"
|
||||
#include "config/ConfigError.hxx"
|
||||
#include "FileSystem.hxx"
|
||||
#include "FileInfo.hxx"
|
||||
#include "Path.hxx"
|
||||
#include "AllocatedPath.hxx"
|
||||
#include "DirectoryReader.hxx"
|
||||
@@ -32,15 +32,15 @@
|
||||
void
|
||||
CheckDirectoryReadable(Path path_fs)
|
||||
{
|
||||
struct stat st;
|
||||
if (!StatFile(path_fs, st)) {
|
||||
FormatErrno(config_domain,
|
||||
"Failed to stat directory \"%s\"",
|
||||
path_fs.c_str());
|
||||
Error error;
|
||||
|
||||
FileInfo fi;
|
||||
if (!GetFileInfo(path_fs, fi, error)) {
|
||||
LogError(error);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!S_ISDIR(st.st_mode)) {
|
||||
if (!fi.IsDirectory()) {
|
||||
FormatError(config_domain,
|
||||
"Not a directory: %s", path_fs.c_str());
|
||||
return;
|
||||
@@ -49,7 +49,7 @@ CheckDirectoryReadable(Path path_fs)
|
||||
#ifndef WIN32
|
||||
const auto x = AllocatedPath::Build(path_fs,
|
||||
PathTraitsFS::CURRENT_DIRECTORY);
|
||||
if (!StatFile(x, st) && errno == EACCES)
|
||||
if (!GetFileInfo(x, fi) && errno == EACCES)
|
||||
FormatError(config_domain,
|
||||
"No permission to traverse (\"execute\") directory: %s",
|
||||
path_fs.c_str());
|
||||
|
Reference in New Issue
Block a user