1. Fixed file_helper::exists() bug under windows which returned false in some circumstances

2. Improved file_helper::exists() performance under linux to use stat sys call
3. Added unit tests
This commit is contained in:
gabime
2015-12-12 20:53:00 +02:00
parent 87da9aab26
commit a9fb96e088
6 changed files with 35 additions and 22 deletions

View File

@@ -14,7 +14,7 @@
#include <thread>
#include <chrono>
#include "os.h"
#include "log_msg.h"
@@ -125,16 +125,8 @@ public:
static bool file_exists(const std::string& name)
{
FILE* file;
if (!os::fopen_s(&file, name.c_str(), "r"))
{
fclose(file);
return true;
}
else
{
return false;
}
return os::file_exists(name);
}

View File

@@ -2,8 +2,8 @@
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#pragma once
#include<string>
#include<cstdio>
#include<ctime>
@@ -20,6 +20,7 @@
#elif __linux__
#include <sys/syscall.h> //Use gettid() syscall under linux to get thread id
#include <sys/stat.h>
#include <unistd.h>
#else
#include <thread>
@@ -138,6 +139,19 @@ inline int fopen_s(FILE** fp, const std::string& filename, const char* mode)
return *fp == nullptr;
#endif
}
//Return if file exists
inline bool file_exists(const std::string& filename)
{
#ifdef _WIN32
auto attribs = GetFileAttributesA(filename.c_str());
return (attribs != INVALID_FILE_ATTRIBUTES && !(attribs & FILE_ATTRIBUTE_DIRECTORY));
#else
struct stat buffer;
return (stat (name.c_str(), &buffer) == 0);
#endif
}