Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

replace stat with std::filesystem #2735

Merged
merged 1 commit into from
Aug 5, 2023
Merged

replace stat with std::filesystem #2735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions samples/geotag.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ namespace fs = std::experimental::filesystem;

#ifdef _WIN32
#include <windows.h>
char* realpath(const char* file, char* path);
#define lstat stat
#if _MSC_VER < 1400
#define strcpy_s(d, l, s) strcpy(d, s)
#define strcat_s(d, l, s) strcat(d, s)
Expand Down Expand Up @@ -464,8 +462,6 @@ bool readDir(const char* path, Options& options) {
// print all the files and directories within directory
while ((ent = readdir(dir)) != nullptr) {
std::string pathName = makePath(path, ent->d_name);
struct stat buf;
lstat(path, &buf);
if (ent->d_name[0] != '.') {
// printf("reading %s => %s\n",ent->d_name,pathName.c_str());
if (getFileType(pathName, options) == typeImage) {
Expand Down
46 changes: 18 additions & 28 deletions src/basicio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
#include <iostream>

// + standard includes
#include <fcntl.h> // _O_BINARY in FileIo::FileIo
#include <sys/stat.h> // for stat, chmod
#include <fcntl.h> // _O_BINARY in FileIo::FileIo

#if __has_include(<sys/mman.h>)
#include <sys/mman.h> // for mmap and munmap
Expand All @@ -37,7 +36,6 @@
#endif

#ifdef _WIN32
using mode_t = unsigned short;
#include <io.h>
#include <windows.h>
#endif
Expand Down Expand Up @@ -101,8 +99,8 @@ class FileIo::Impl {
// TYPES
//! Simple struct stat wrapper for internal use
struct StructStat {
mode_t st_mode{0}; //!< Permissions
off_t st_size{0}; //!< Size
fs::perms st_mode{}; //!< Permissions
std::uintmax_t st_size{}; //!< Size
};
// #endif
// METHODS
Expand Down Expand Up @@ -181,13 +179,13 @@ int FileIo::Impl::switchMode(OpMode opMode) {
} // FileIo::Impl::switchMode

int FileIo::Impl::stat(StructStat& buf) const {
struct stat st;
auto ret = ::stat(path_.c_str(), &st);
if (ret == 0) {
buf.st_size = st.st_size;
buf.st_mode = st.st_mode;
try {
buf.st_size = fs::file_size(path_);
buf.st_mode = fs::status(path_).permissions();
return 0;
} catch (const fs::filesystem_error&) {
return -1;
}
return ret;
} // FileIo::Impl::stat

FileIo::FileIo(const std::string& path) : p_(std::make_unique<Impl>(path)) {
Expand Down Expand Up @@ -356,8 +354,8 @@ void FileIo::transfer(BasicIo& src) {
close();

bool statOk = true;
mode_t origStMode = 0;
auto pf = path().c_str();
fs::perms origStMode = {};
auto pf = path();

Impl::StructStat buf1;
if (p_->stat(buf1) == -1) {
Expand All @@ -372,14 +370,15 @@ void FileIo::transfer(BasicIo& src) {
// that file has been opened with FILE_SHARE_DELETE by another process,
// like a virus scanner or disk indexer
// (see also http://stackoverflow.com/a/11023068)
auto ret = ReplaceFileA(pf, fileIo->path().c_str(), nullptr, REPLACEFILE_IGNORE_MERGE_ERRORS, nullptr, nullptr);
auto ret =
ReplaceFileA(pf.c_str(), fileIo->path().c_str(), nullptr, REPLACEFILE_IGNORE_MERGE_ERRORS, nullptr, nullptr);
if (ret == 0) {
if (GetLastError() != ERROR_FILE_NOT_FOUND)
throw Error(ErrorCode::kerFileRenameFailed, fileIo->path(), pf, strError());
fs::rename(fileIo->path(), pf);
fs::remove(fileIo->path());
} else {
if (fileExists(pf) && ::remove(pf) != 0)
if (fileExists(pf) && fs::remove(pf) != 0)
throw Error(ErrorCode::kerCallFailed, pf, strError(), "fs::remove");
fs::rename(fileIo->path(), pf);
fs::remove(fileIo->path());
Expand All @@ -392,15 +391,10 @@ void FileIo::transfer(BasicIo& src) {
fs::remove(fileIo->path());
#endif
// Check permissions of new file
struct stat buf2;
if (statOk && ::stat(pf, &buf2) == -1) {
statOk = false;
#ifndef SUPPRESS_WARNINGS
EXV_WARNING << Error(ErrorCode::kerCallFailed, pf, strError(), "::stat") << "\n";
#endif
}
auto newStMode = fs::status(pf).permissions();
// Set original file permissions
if (statOk && origStMode != buf2.st_mode && ::chmod(pf, origStMode) == -1) {
if (statOk && origStMode != newStMode) {
fs::permissions(pf, origStMode);
#ifndef SUPPRESS_WARNINGS
EXV_WARNING << Error(ErrorCode::kerCallFailed, pf, strError(), "::chmod") << "\n";
#endif
Expand Down Expand Up @@ -1718,11 +1712,7 @@ DataBuf readFile(const std::string& path) {
if (file.open("rb") != 0) {
throw Error(ErrorCode::kerFileOpenFailed, path, "rb", strError());
}
struct stat st;
if (0 != ::stat(path.c_str(), &st)) {
throw Error(ErrorCode::kerCallFailed, path, strError(), "::stat");
}
DataBuf buf(st.st_size);
DataBuf buf(fs::file_size(path));
if (file.read(buf.data(), buf.size()) != buf.size()) {
throw Error(ErrorCode::kerCallFailed, path, strError(), "FileIo::read");
}
Expand Down
2 changes: 1 addition & 1 deletion src/futils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace fs = std::experimental::filesystem;
#endif

#if __has_include(<unistd.h>)
#include <unistd.h> // for stat()
#include <unistd.h> // for getpid()
#endif

#if defined(__FreeBSD__)
Expand Down