third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use remove from filesystem

Browse Source
This commit is contained in:
Luis Díaz Más 2022-02-16 18:59:29 +01:00
parent 9b3a643d33
commit 56b5ab9a29
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/actions.cpp
View File

@ -1945,7 +1945,8 @@ namespace {
}
// delete temporary target
if ( bStdout ) std::remove(target.c_str());
if ( bStdout )
fs::remove(target.c_str());
return rc;
} // metacopy

17
src/basicio.cpp
View File

@ -476,9 +476,8 @@ namespace Exiv2 {
fileIo->close();
// Check if the file can be written to, if it already exists
if (open("a+b") != 0) {
/// \todo Use std::filesystem once C++17 can be used
// Remove the (temporary) file
::remove(fileIo->path().c_str());
fs::remove(fileIo->path().c_str());
throw Error(kerFileOpenFailed, path(), "a+b", strError());
}
close();
@ -540,7 +539,7 @@ namespace Exiv2 {
if (ret == 0) {
if (GetLastError() == ERROR_FILE_NOT_FOUND) {
fs::rename(fileIo->path().c_str(), pf);
::remove(fileIo->path().c_str());
fs::remove(fileIo->path().c_str());
}
else {
throw Error(kerFileRenameFailed, fileIo->path(), pf, strError());
@ -549,18 +548,18 @@ namespace Exiv2 {
}
else {
if (fileExists(pf) && ::remove(pf) != 0) {
throw Error(kerCallFailed, pf, strError(), "::remove");
throw Error(kerCallFailed, pf, strError(), "fs::remove");
}
fs::rename(fileIo->path().c_str(), pf);
::remove(fileIo->path().c_str());
fs::remove(fileIo->path().c_str());
}
}
#else
if (fileExists(pf) && ::remove(pf) != 0) {
throw Error(kerCallFailed, pf, strError(), "::remove");
if (fileExists(pf) && fs::remove(pf) != 0) {
throw Error(kerCallFailed, pf, strError(), "fs::remove");
}
fs::rename(fileIo->path().c_str(), pf);
::remove(fileIo->path().c_str());
fs::remove(fileIo->path().c_str());
#endif
// Check permissions of new file
struct stat buf2;
@ -1115,7 +1114,7 @@ namespace Exiv2 {
}
XPathIo::~XPathIo() {
if (isTemp_ && remove(tempFilePath_.c_str()) != 0) {
if (isTemp_ && !fs::remove(tempFilePath_)) {
// error when removing file
// printf ("Warning: Unable to remove the temp file %s.\n", tempFilePath_.c_str());
}

2
unitTests/test_ImageFactory.cpp
View File

@ -65,7 +65,7 @@ TEST(TheImageFactory, createsInstancesForFewSupportedTypesInFiles)
EXPECT_NO_THROW(ImageFactory::create(ImageType::pgf, filePath));
EXPECT_NO_THROW(ImageFactory::create(ImageType::png, filePath));
EXPECT_EQ(0, std::remove(filePath.c_str()));
EXPECT_TRUE(fs::remove(filePath));
}
TEST(TheImageFactory, cannotCreateInstancesForSomeTypesInFiles)

5
unitTests/test_futils.cpp
View File

@ -23,6 +23,7 @@
#include <exiv2/futils.hpp>
// Auxiliary headers
#include <filesystem>
#include <fstream>
#include <cstdio>
#include <cerrno>
@ -30,6 +31,8 @@
#include <gtest/gtest.h>
namespace fs = std::filesystem;
using namespace Exiv2;
TEST(strError, returnSuccessAfterClosingFile)
@ -42,7 +45,7 @@ TEST(strError, returnSuccessAfterClosingFile)
std::string tmpFile("tmp.dat");
std::ofstream auxFile(tmpFile.c_str());
auxFile.close();
std::remove(tmpFile.c_str());
fs::remove(tmpFile.c_str());
ASSERT_TRUE(strError().find("(errno = 0)") != std::string::npos);
}