mirror of
https://github.com/rwengine/openrw.git
synced 2024-09-15 15:02:34 +02:00
Merge pull request #182 from darkf/filesystem
Switch filesystem handling to boost::filesystem
This commit is contained in:
Daniel Evans
GitHub
commit
1fd6ae884f
14
.travis.yml
14
.travis.yml
@ -1,9 +1,17 @@
|
||||
sudo: required
|
||||
dist: trusty
|
||||
language: cpp
|
||||
before_install:
|
||||
- sudo apt-get update -qq
|
||||
- sudo apt-get install -y libbullet-dev libsdl2-dev libmad0-dev libglm-dev libsndfile-dev libopenal-dev libboost-test-dev
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- libbullet-dev
|
||||
- libsdl2-dev
|
||||
- libmad0-dev
|
||||
- libglm-dev
|
||||
- libsndfile-dev
|
||||
- libopenal-dev
|
||||
- libboost-test-dev
|
||||
- libboost-filesystem-dev
|
||||
git:
|
||||
depth: 3
|
||||
script:
|
||||
|
||||
@ -14,65 +14,13 @@
|
||||
#include <loaders/LoaderGXT.hpp>
|
||||
#include <loaders/BackgroundLoader.hpp>
|
||||
#include <core/Logger.hpp>
|
||||
#include <platform/FileIndex.hpp>
|
||||
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
#include <sstream>
|
||||
#include <algorithm>
|
||||
|
||||
#ifndef RW_WINDOWS
|
||||
#include <dirent.h>
|
||||
#else
|
||||
#include <platform/msdirent.h>
|
||||
#endif
|
||||
#include <sys/types.h>
|
||||
|
||||
/**
|
||||
* Finds the 'real' case for a path, to get around the fact that Rockstar's data is usually the wrong case.
|
||||
* @param base The base of the path to start looking from.
|
||||
* @param path the lowercase path.
|
||||
*/
|
||||
std::string findPathRealCase(const std::string& base, const std::string& path)
|
||||
{
|
||||
#ifndef RW_WINDOWS
|
||||
size_t endslash = path.find("/");
|
||||
bool isDirectory = true;
|
||||
if(endslash == path.npos) {
|
||||
isDirectory = false;
|
||||
}
|
||||
std::string orgFileName = isDirectory ? path.substr(0, endslash) : path;
|
||||
std::transform(orgFileName.begin(), orgFileName.end(), orgFileName.begin(), ::tolower);
|
||||
std::string realName;
|
||||
|
||||
// Open the current "base" path (i.e. the real path)
|
||||
DIR* dp = opendir(base.c_str());
|
||||
dirent* ep;
|
||||
|
||||
if( dp != NULL) {
|
||||
while( (ep = readdir(dp)) ) {
|
||||
realName = ep->d_name;
|
||||
std::string lowerRealName = realName;
|
||||
std::transform(lowerRealName.begin(), lowerRealName.end(), lowerRealName.begin(), ::tolower);
|
||||
if( lowerRealName == orgFileName) {
|
||||
closedir(dp);
|
||||
if( isDirectory) {
|
||||
return findPathRealCase(base + "/" + realName, path.substr(endslash+1));
|
||||
}
|
||||
else {
|
||||
return base + "/" + realName;
|
||||
}
|
||||
}
|
||||
}
|
||||
closedir(dp);
|
||||
}
|
||||
|
||||
return "";
|
||||
#else
|
||||
// Is anything other than Windows likely to fall here?
|
||||
return base + "/" + path;
|
||||
#endif
|
||||
}
|
||||
|
||||
// Yet another hack function to fix these paths
|
||||
std::string fixPath(std::string path) {
|
||||
for( size_t t = 0; t < path.size(); ++t) {
|
||||
@ -84,7 +32,6 @@ std::string fixPath(std::string path) {
|
||||
return path;
|
||||
}
|
||||
|
||||
|
||||
GameData::GameData(Logger* log, WorkContext* work, const std::string& path)
|
||||
: datpath(path), logger(log), workContext(work), engine(nullptr)
|
||||
{
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
#include <cstring>
|
||||
#include <iconv.h>
|
||||
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <boost/range/iterator_range.hpp>
|
||||
|
||||
// Original save game file data structures
|
||||
typedef uint16_t BlockWord;
|
||||
typedef uint32_t BlockDword;
|
||||
@ -1216,11 +1219,7 @@ bool SaveGame::loadGame(GameState& state, const std::string& file)
|
||||
|
||||
return true;
|
||||
}
|
||||
#ifndef RW_WINDOWS
|
||||
#include <dirent.h>
|
||||
#else
|
||||
#include <platform/msdirent.h>
|
||||
#endif
|
||||
|
||||
bool SaveGame::getSaveInfo(const std::string& file, BasicState *basicState)
|
||||
{
|
||||
std::FILE* loadFile = std::fopen(file.c_str(), "rb");
|
||||
@ -1258,8 +1257,10 @@ bool SaveGame::getSaveInfo(const std::string& file, BasicState *basicState)
|
||||
return true;
|
||||
}
|
||||
|
||||
std::vector< SaveGameInfo > SaveGame::getAllSaveGameInfo()
|
||||
std::vector<SaveGameInfo> SaveGame::getAllSaveGameInfo()
|
||||
{
|
||||
using namespace boost::filesystem;
|
||||
|
||||
// TODO consider windows
|
||||
auto homedir = getenv("HOME");
|
||||
if( homedir == nullptr ) {
|
||||
@ -1267,29 +1268,22 @@ std::vector< SaveGameInfo > SaveGame::getAllSaveGameInfo()
|
||||
return {};
|
||||
}
|
||||
const char gameDir[] = "GTA3 User Files";
|
||||
std::string gamePath(homedir);
|
||||
gamePath.append("/");
|
||||
gamePath.append(gameDir);
|
||||
|
||||
DIR* dp = opendir(gamePath.c_str());
|
||||
dirent* ep;
|
||||
std::string realName;
|
||||
if ( dp == NULL ) {
|
||||
path gamePath(homedir);
|
||||
gamePath /= gameDir;
|
||||
|
||||
if(!exists(gamePath) || !is_directory(gamePath))
|
||||
return {};
|
||||
}
|
||||
|
||||
std::vector<SaveGameInfo> infos;
|
||||
while( (ep = readdir(dp)) )
|
||||
{
|
||||
if ( ep->d_type == DT_REG ) {
|
||||
realName = ep->d_name;
|
||||
if(realName.find(".b") != realName.npos) {
|
||||
std::string path = gamePath+"/"+realName;
|
||||
infos.emplace_back(SaveGameInfo{path, false, BasicState()});
|
||||
infos.back().valid = getSaveInfo(infos.back().savePath, &infos.back().basicState);
|
||||
}
|
||||
for(const path& save_path : boost::make_iterator_range(directory_iterator(gamePath), {})) {
|
||||
if(save_path.extension() == ".b") {
|
||||
std::cout << save_path.string() << std::endl;
|
||||
infos.emplace_back(SaveGameInfo {save_path.string(), false, BasicState()});
|
||||
infos.back().valid = getSaveInfo(infos.back().savePath, &infos.back().basicState);
|
||||
}
|
||||
}
|
||||
closedir(dp);
|
||||
|
||||
return infos;
|
||||
}
|
||||
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
###########################################################
|
||||
## RWLIB
|
||||
###########################################################
|
||||
|
||||
find_package(Boost COMPONENTS filesystem system REQUIRED)
|
||||
|
||||
SET(RWLIB_SOURCES
|
||||
|
||||
# GL stuff is only here temporarily, hoping to move it back to rwengine
|
||||
@ -44,11 +47,13 @@ add_library(rwlib
|
||||
)
|
||||
|
||||
include_directories(
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/source")
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/source"
|
||||
"${Boost_INCLUDE_DIRS}")
|
||||
|
||||
target_include_directories(rwlib
|
||||
PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/source")
|
||||
|
||||
target_link_libraries(rwlib
|
||||
${OPENGL_LIBRARIES}
|
||||
${OPENRW_PLATFORM_LIBS})
|
||||
${OPENRW_PLATFORM_LIBS}
|
||||
${Boost_LIBRARIES})
|
||||
|
||||
@ -1,100 +1,78 @@
|
||||
#include <algorithm>
|
||||
#include <fstream>
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <boost/range/iterator_range.hpp>
|
||||
#include <platform/FileIndex.hpp>
|
||||
#include <loaders/LoaderIMG.hpp>
|
||||
|
||||
#include <algorithm>
|
||||
#include <fstream>
|
||||
#ifndef RW_WINDOWS
|
||||
#include <dirent.h>
|
||||
#else
|
||||
#include <platform/msdirent.h>
|
||||
#endif
|
||||
using namespace boost::filesystem;
|
||||
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
void FileIndex::indexDirectory(const std::string& directory)
|
||||
/**
|
||||
* Finds the 'real' case for a path, to get around the fact that Rockstar's data is usually the wrong case.
|
||||
* @param base The base of the path to start looking from.
|
||||
* @param path the lowercase path.
|
||||
*/
|
||||
std::string findPathRealCase(const std::string& base_src, const std::string& path_src)
|
||||
{
|
||||
DIR* dp = opendir(directory.c_str());
|
||||
dirent* ep;
|
||||
std::string realName, lowerName;
|
||||
if ( dp == NULL ) {
|
||||
throw std::runtime_error("Unable to open directory: " + directory);
|
||||
}
|
||||
while( (ep = readdir(dp)) )
|
||||
{
|
||||
realName = ep->d_name;
|
||||
lowerName = realName;
|
||||
std::transform(lowerName.begin(), lowerName.end(), lowerName.begin(), ::tolower);
|
||||
bool isRegularFile = false;
|
||||
if (ep->d_type != DT_UNKNOWN) {
|
||||
isRegularFile = ep->d_type == DT_REG;
|
||||
} else {
|
||||
std::string filepath = directory +"/"+ realName;
|
||||
struct stat filedata;
|
||||
if (stat(filepath.c_str(), &filedata) == 0) {
|
||||
isRegularFile = S_ISREG(filedata.st_mode);
|
||||
path base(base_src);
|
||||
path searchpath(path_src);
|
||||
|
||||
// Iterate over each component of the path
|
||||
for(const path& path_component : boost::make_iterator_range(searchpath.begin(), searchpath.end())) {
|
||||
std::string cmpLower = path_component.string();
|
||||
std::transform(cmpLower.begin(), cmpLower.end(), cmpLower.begin(), ::tolower);
|
||||
|
||||
// Search the current base path for a filename matching the component we're searching for
|
||||
bool found = false;
|
||||
for(const path& entry : boost::make_iterator_range(directory_iterator(base), {})) {
|
||||
std::string lowerName = entry.filename().string();
|
||||
std::transform(lowerName.begin(), lowerName.end(), lowerName.begin(), ::tolower);
|
||||
|
||||
if(lowerName == cmpLower) {
|
||||
// We got a match, so add it to base and continue
|
||||
base /= entry.filename();
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (isRegularFile) {
|
||||
files[ lowerName ] = {
|
||||
lowerName,
|
||||
realName,
|
||||
directory,
|
||||
""
|
||||
};
|
||||
|
||||
if(!found) {
|
||||
throw std::runtime_error("Can't find real path case of " + path_src);
|
||||
}
|
||||
}
|
||||
closedir(dp);
|
||||
|
||||
return base.string();
|
||||
}
|
||||
|
||||
void FileIndex::indexTree(const std::string& root)
|
||||
{
|
||||
indexDirectory(root);
|
||||
|
||||
DIR* dp = opendir(root.c_str());
|
||||
dirent* ep;
|
||||
if ( dp == NULL ) {
|
||||
throw std::runtime_error("Unable to open directory: " + root);
|
||||
}
|
||||
while( (ep = readdir(dp)) )
|
||||
{
|
||||
std::string filepath = root +"/"+ ep->d_name;
|
||||
for(const path& entry : boost::make_iterator_range(recursive_directory_iterator(root), {})) {
|
||||
std::string directory = entry.parent_path().string();
|
||||
std::string realName = entry.filename().string();
|
||||
std::string lowerName = realName;
|
||||
std::transform(lowerName.begin(), lowerName.end(), lowerName.begin(), ::tolower);
|
||||
|
||||
bool isDirectory = false;
|
||||
if (ep->d_type != DT_UNKNOWN) {
|
||||
isDirectory = ep->d_type == DT_DIR;
|
||||
} else {
|
||||
struct stat filedata;
|
||||
if (stat(filepath.c_str(), &filedata) == 0) {
|
||||
isDirectory = S_ISDIR(filedata.st_mode);
|
||||
}
|
||||
}
|
||||
|
||||
if (isDirectory && ep->d_name[0] != '.') {
|
||||
indexTree(filepath);
|
||||
if(is_regular_file(entry)) {
|
||||
files[lowerName] = {lowerName, realName, directory, ""};
|
||||
}
|
||||
}
|
||||
closedir(dp);
|
||||
}
|
||||
|
||||
void FileIndex::indexArchive(const std::string& archive)
|
||||
{
|
||||
// Split directory from archive name
|
||||
auto slash = archive.find_last_of('/');
|
||||
auto directory = archive.substr(0, slash);
|
||||
auto archivebasename = archive.substr(slash+1);
|
||||
auto archivepath = directory + "/" + archivebasename;
|
||||
path archive_path = path(archive);
|
||||
path directory = archive_path.parent_path();
|
||||
path archive_basename = archive_path.filename();
|
||||
path archive_full_path = directory/archive_basename;
|
||||
|
||||
LoaderIMG img;
|
||||
|
||||
if( ! img.load( archivepath ) )
|
||||
{
|
||||
throw std::runtime_error("Failed to load IMG archive: " + archivepath);
|
||||
LoaderIMG img;
|
||||
if(!img.load(archive_full_path.string())) {
|
||||
throw std::runtime_error("Failed to load IMG archive: " + archive_full_path.string());
|
||||
}
|
||||
|
||||
std::string lowerName;
|
||||
for( size_t i = 0; i < img.getAssetCount(); ++i )
|
||||
{
|
||||
for( size_t i = 0; i < img.getAssetCount(); ++i ) {
|
||||
auto& asset = img.getAssetInfoByIndex(i);
|
||||
|
||||
if( asset.size == 0 ) continue;
|
||||
@ -102,20 +80,14 @@ void FileIndex::indexArchive(const std::string& archive)
|
||||
lowerName = asset.name;
|
||||
std::transform(lowerName.begin(), lowerName.end(), lowerName.begin(), ::tolower);
|
||||
|
||||
files[ lowerName ] = {
|
||||
lowerName,
|
||||
asset.name,
|
||||
directory,
|
||||
archivebasename
|
||||
};
|
||||
files[lowerName] = {lowerName, asset.name, directory.string(), archive_basename.string()};
|
||||
}
|
||||
}
|
||||
|
||||
bool FileIndex::findFile(const std::string& filename, FileIndex::IndexData& filedata)
|
||||
{
|
||||
auto iterator = files.find( filename );
|
||||
if( iterator == files.end() )
|
||||
{
|
||||
auto iterator = files.find(filename);
|
||||
if( iterator == files.end() ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -127,8 +99,7 @@ bool FileIndex::findFile(const std::string& filename, FileIndex::IndexData& file
|
||||
FileHandle FileIndex::openFile(const std::string& filename)
|
||||
{
|
||||
auto iterator = files.find( filename );
|
||||
if( iterator == files.end() )
|
||||
{
|
||||
if( iterator == files.end() ) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
@ -140,26 +111,22 @@ FileHandle FileIndex::openFile(const std::string& filename)
|
||||
char* data = nullptr;
|
||||
size_t length = 0;
|
||||
|
||||
if( isArchive )
|
||||
{
|
||||
if( isArchive ) {
|
||||
fsName = f.directory + "/" + f.archive;
|
||||
|
||||
LoaderIMG img;
|
||||
|
||||
if( ! img.load(fsName) )
|
||||
{
|
||||
if( ! img.load(fsName) ) {
|
||||
throw std::runtime_error("Failed to load IMG archive: " + fsName);
|
||||
}
|
||||
|
||||
LoaderIMGFile file;
|
||||
if( img.findAssetInfo(f.originalName, file) )
|
||||
{
|
||||
if( img.findAssetInfo(f.originalName, file) ) {
|
||||
length = file.size * 2048;
|
||||
data = img.loadToMemory(f.originalName);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
else {
|
||||
std::ifstream dfile(fsName.c_str(), std::ios_base::binary);
|
||||
if ( ! dfile.is_open()) {
|
||||
throw std::runtime_error("Unable to open file: " + fsName);
|
||||
@ -172,8 +139,7 @@ FileHandle FileIndex::openFile(const std::string& filename)
|
||||
dfile.read(data, length);
|
||||
}
|
||||
|
||||
if( data == nullptr )
|
||||
{
|
||||
if( data == nullptr ) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
||||
@ -4,6 +4,8 @@
|
||||
#include <string>
|
||||
#include <map>
|
||||
|
||||
std::string findPathRealCase(const std::string& base_src, const std::string& path_src);
|
||||
|
||||
class FileIndex
|
||||
{
|
||||
public:
|
||||
@ -19,12 +21,6 @@ public:
|
||||
/// The archive filename (if applicable)
|
||||
std::string archive;
|
||||
};
|
||||
|
||||
/**
|
||||
* Adds the files contained within the given directory to the
|
||||
* file index.
|
||||
*/
|
||||
void indexDirectory(const std::string& directory);
|
||||
|
||||
/**
|
||||
* Adds the files contained within the given directory tree to the
|
||||
|
||||
@ -1,372 +0,0 @@
|
||||
/*****************************************************************************
|
||||
* dirent.h - dirent API for Microsoft Visual Studio
|
||||
*
|
||||
* Copyright (C) 2006 Toni Ronkko
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
* ``Software''), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
* IN NO EVENT SHALL TONI RONKKO BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
* OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
* Mar 15, 2011, Toni Ronkko
|
||||
* Defined FILE_ATTRIBUTE_DEVICE for MSVC 6.0.
|
||||
*
|
||||
* Aug 11, 2010, Toni Ronkko
|
||||
* Added d_type and d_namlen fields to dirent structure. The former is
|
||||
* especially useful for determining whether directory entry represents a
|
||||
* file or a directory. For more information, see
|
||||
* http://www.delorie.com/gnu/docs/glibc/libc_270.html
|
||||
*
|
||||
* Aug 11, 2010, Toni Ronkko
|
||||
* Improved conformance to the standards. For example, errno is now set
|
||||
* properly on failure and assert() is never used. Thanks to Peter Brockam
|
||||
* for suggestions.
|
||||
*
|
||||
* Aug 11, 2010, Toni Ronkko
|
||||
* Fixed a bug in rewinddir(): when using relative directory names, change
|
||||
* of working directory no longer causes rewinddir() to fail.
|
||||
*
|
||||
* Dec 15, 2009, John Cunningham
|
||||
* Added rewinddir member function
|
||||
*
|
||||
* Jan 18, 2008, Toni Ronkko
|
||||
* Using FindFirstFileA and WIN32_FIND_DATAA to avoid converting string
|
||||
* between multi-byte and unicode representations. This makes the
|
||||
* code simpler and also allows the code to be compiled under MingW. Thanks
|
||||
* to Azriel Fasten for the suggestion.
|
||||
*
|
||||
* Mar 4, 2007, Toni Ronkko
|
||||
* Bug fix: due to the strncpy_s() function this file only compiled in
|
||||
* Visual Studio 2005. Using the new string functions only when the
|
||||
* compiler version allows.
|
||||
*
|
||||
* Nov 2, 2006, Toni Ronkko
|
||||
* Major update: removed support for Watcom C, MS-DOS and Turbo C to
|
||||
* simplify the file, updated the code to compile cleanly on Visual
|
||||
* Studio 2005 with both unicode and multi-byte character strings,
|
||||
* removed rewinddir() as it had a bug.
|
||||
*
|
||||
* Aug 20, 2006, Toni Ronkko
|
||||
* Removed all remarks about MSVC 1.0, which is antiqued now. Simplified
|
||||
* comments by removing SGML tags.
|
||||
*
|
||||
* May 14 2002, Toni Ronkko
|
||||
* Embedded the function definitions directly to the header so that no
|
||||
* source modules need to be included in the Visual Studio project. Removed
|
||||
* all the dependencies to other projects so that this very header can be
|
||||
* used independently.
|
||||
*
|
||||
* May 28 1998, Toni Ronkko
|
||||
* First version.
|
||||
*****************************************************************************/
|
||||
#ifndef DIRENT_H
|
||||
#define DIRENT_H
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <errno.h>
|
||||
|
||||
/* Entries missing from MSVC 6.0 */
|
||||
#if !defined(FILE_ATTRIBUTE_DEVICE)
|
||||
# define FILE_ATTRIBUTE_DEVICE 0x40
|
||||
#endif
|
||||
|
||||
/* File type and permission flags for stat() */
|
||||
#if defined(_MSC_VER) && !defined(S_IREAD)
|
||||
# define S_IFMT _S_IFMT /* file type mask */
|
||||
# define S_IFDIR _S_IFDIR /* directory */
|
||||
# define S_IFCHR _S_IFCHR /* character device */
|
||||
# define S_IFFIFO _S_IFFIFO /* pipe */
|
||||
# define S_IFREG _S_IFREG /* regular file */
|
||||
# define S_IREAD _S_IREAD /* read permission */
|
||||
# define S_IWRITE _S_IWRITE /* write permission */
|
||||
# define S_IEXEC _S_IEXEC /* execute permission */
|
||||
#endif
|
||||
#define S_IFBLK 0 /* block device */
|
||||
#define S_IFLNK 0 /* link */
|
||||
#define S_IFSOCK 0 /* socket */
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# define S_IRUSR S_IREAD /* read, user */
|
||||
# define S_IWUSR S_IWRITE /* write, user */
|
||||
# define S_IXUSR 0 /* execute, user */
|
||||
# define S_IRGRP 0 /* read, group */
|
||||
# define S_IWGRP 0 /* write, group */
|
||||
# define S_IXGRP 0 /* execute, group */
|
||||
# define S_IROTH 0 /* read, others */
|
||||
# define S_IWOTH 0 /* write, others */
|
||||
# define S_IXOTH 0 /* execute, others */
|
||||
#endif
|
||||
|
||||
/* Indicates that d_type field is available in dirent structure */
|
||||
#define _DIRENT_HAVE_D_TYPE
|
||||
|
||||
/* File type flags for d_type */
|
||||
#define DT_UNKNOWN 0
|
||||
#define DT_REG S_IFREG
|
||||
#define DT_DIR S_IFDIR
|
||||
#define DT_FIFO S_IFFIFO
|
||||
#define DT_SOCK S_IFSOCK
|
||||
#define DT_CHR S_IFCHR
|
||||
#define DT_BLK S_IFBLK
|
||||
|
||||
/* Macros for converting between st_mode and d_type */
|
||||
#define IFTODT(mode) ((mode) & S_IFMT)
|
||||
#define DTTOIF(type) (type)
|
||||
|
||||
/*
|
||||
* File type macros. Note that block devices, sockets and links cannot be
|
||||
* distinguished on Windows and the macros S_ISBLK, S_ISSOCK and S_ISLNK are
|
||||
* only defined for compatibility. These macros should always return false
|
||||
* on Windows.
|
||||
*/
|
||||
#define S_ISFIFO(mode) (((mode) & S_IFMT) == S_IFFIFO)
|
||||
#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
|
||||
#define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG)
|
||||
#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)
|
||||
#define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK)
|
||||
#define S_ISCHR(mode) (((mode) & S_IFMT) == S_IFCHR)
|
||||
#define S_ISBLK(mode) (((mode) & S_IFMT) == S_IFBLK)
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
|
||||
typedef struct dirent
|
||||
{
|
||||
char d_name[MAX_PATH + 1]; /* File name */
|
||||
size_t d_namlen; /* Length of name without \0 */
|
||||
int d_type; /* File type */
|
||||
} dirent;
|
||||
|
||||
|
||||
typedef struct DIR
|
||||
{
|
||||
dirent curentry; /* Current directory entry */
|
||||
WIN32_FIND_DATAA find_data; /* Private file data */
|
||||
int cached; /* True if data is valid */
|
||||
HANDLE search_handle; /* Win32 search handle */
|
||||
char patt[MAX_PATH + 3]; /* Initial directory name */
|
||||
} DIR;
|
||||
|
||||
|
||||
/* Forward declarations */
|
||||
static DIR *opendir(const char *dirname);
|
||||
static struct dirent *readdir(DIR *dirp);
|
||||
static int closedir(DIR *dirp);
|
||||
static void rewinddir(DIR* dirp);
|
||||
|
||||
|
||||
/* Use the new safe string functions introduced in Visual Studio 2005 */
|
||||
#if defined(_MSC_VER) && _MSC_VER >= 1400
|
||||
# define DIRENT_STRNCPY(dest,src,size) strncpy_s((dest),(size),(src),_TRUNCATE)
|
||||
#else
|
||||
# define DIRENT_STRNCPY(dest,src,size) strncpy((dest),(src),(size))
|
||||
#endif
|
||||
|
||||
/* Set errno variable */
|
||||
#if defined(_MSC_VER)
|
||||
#define DIRENT_SET_ERRNO(x) _set_errno (x)
|
||||
#else
|
||||
#define DIRENT_SET_ERRNO(x) (errno = (x))
|
||||
#endif
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* Open directory stream DIRNAME for read and return a pointer to the
|
||||
* internal working area that is used to retrieve individual directory
|
||||
* entries.
|
||||
*/
|
||||
static DIR *opendir(const char *dirname)
|
||||
{
|
||||
DIR *dirp;
|
||||
|
||||
/* ensure that the resulting search pattern will be a valid file name */
|
||||
if (dirname == NULL) {
|
||||
DIRENT_SET_ERRNO (ENOENT);
|
||||
return NULL;
|
||||
}
|
||||
if (strlen (dirname) + 3 >= MAX_PATH) {
|
||||
DIRENT_SET_ERRNO (ENAMETOOLONG);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* construct new DIR structure */
|
||||
dirp = (DIR*) malloc (sizeof (struct DIR));
|
||||
if (dirp != NULL) {
|
||||
int error;
|
||||
|
||||
/*
|
||||
* Convert relative directory name to an absolute one. This
|
||||
* allows rewinddir() to function correctly when the current working
|
||||
* directory is changed between opendir() and rewinddir().
|
||||
*/
|
||||
if (GetFullPathNameA (dirname, MAX_PATH, dirp->patt, NULL)) {
|
||||
char *p;
|
||||
|
||||
/* append the search pattern "\\*\0" to the directory name */
|
||||
p = strchr (dirp->patt, '\0');
|
||||
if (dirp->patt < p && *(p-1) != '\\' && *(p-1) != ':') {
|
||||
*p++ = '\\';
|
||||
}
|
||||
*p++ = '*';
|
||||
*p = '\0';
|
||||
|
||||
/* open directory stream and retrieve the first entry */
|
||||
dirp->search_handle = FindFirstFileA (dirp->patt, &dirp->find_data);
|
||||
if (dirp->search_handle != INVALID_HANDLE_VALUE) {
|
||||
/* a directory entry is now waiting in memory */
|
||||
dirp->cached = 1;
|
||||
error = 0;
|
||||
} else {
|
||||
/* search pattern is not a directory name? */
|
||||
DIRENT_SET_ERRNO (ENOENT);
|
||||
error = 1;
|
||||
}
|
||||
} else {
|
||||
/* buffer too small */
|
||||
DIRENT_SET_ERRNO (ENOMEM);
|
||||
error = 1;
|
||||
}
|
||||
|
||||
if (error) {
|
||||
free (dirp);
|
||||
dirp = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
return dirp;
|
||||
}
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* Read a directory entry, and return a pointer to a dirent structure
|
||||
* containing the name of the entry in d_name field. Individual directory
|
||||
* entries returned by this very function include regular files,
|
||||
* sub-directories, pseudo-directories "." and "..", but also volume labels,
|
||||
* hidden files and system files may be returned.
|
||||
*/
|
||||
static struct dirent *readdir(DIR *dirp)
|
||||
{
|
||||
DWORD attr;
|
||||
if (dirp == NULL) {
|
||||
/* directory stream did not open */
|
||||
DIRENT_SET_ERRNO (EBADF);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* get next directory entry */
|
||||
if (dirp->cached != 0) {
|
||||
/* a valid directory entry already in memory */
|
||||
dirp->cached = 0;
|
||||
} else {
|
||||
/* get the next directory entry from stream */
|
||||
if (dirp->search_handle == INVALID_HANDLE_VALUE) {
|
||||
return NULL;
|
||||
}
|
||||
if (FindNextFileA (dirp->search_handle, &dirp->find_data) == FALSE) {
|
||||
/* the very last entry has been processed or an error occured */
|
||||
FindClose (dirp->search_handle);
|
||||
dirp->search_handle = INVALID_HANDLE_VALUE;
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
/* copy as a multibyte character string */
|
||||
DIRENT_STRNCPY ( dirp->curentry.d_name,
|
||||
dirp->find_data.cFileName,
|
||||
sizeof(dirp->curentry.d_name) );
|
||||
dirp->curentry.d_name[MAX_PATH] = '\0';
|
||||
|
||||
/* compute the length of name */
|
||||
dirp->curentry.d_namlen = strlen (dirp->curentry.d_name);
|
||||
|
||||
/* determine file type */
|
||||
attr = dirp->find_data.dwFileAttributes;
|
||||
if ((attr & FILE_ATTRIBUTE_DEVICE) != 0) {
|
||||
dirp->curentry.d_type = DT_CHR;
|
||||
} else if ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0) {
|
||||
dirp->curentry.d_type = DT_DIR;
|
||||
} else {
|
||||
dirp->curentry.d_type = DT_REG;
|
||||
}
|
||||
return &dirp->curentry;
|
||||
}
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* Close directory stream opened by opendir() function. Close of the
|
||||
* directory stream invalidates the DIR structure as well as any previously
|
||||
* read directory entry.
|
||||
*/
|
||||
static int closedir(DIR *dirp)
|
||||
{
|
||||
if (dirp == NULL) {
|
||||
/* invalid directory stream */
|
||||
DIRENT_SET_ERRNO (EBADF);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* release search handle */
|
||||
if (dirp->search_handle != INVALID_HANDLE_VALUE) {
|
||||
FindClose (dirp->search_handle);
|
||||
dirp->search_handle = INVALID_HANDLE_VALUE;
|
||||
}
|
||||
|
||||
/* release directory structure */
|
||||
free (dirp);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* Resets the position of the directory stream to which dirp refers to the
|
||||
* beginning of the directory. It also causes the directory stream to refer
|
||||
* to the current state of the corresponding directory, as a call to opendir()
|
||||
* would have done. If dirp does not refer to a directory stream, the effect
|
||||
* is undefined.
|
||||
*/
|
||||
static void rewinddir(DIR* dirp)
|
||||
{
|
||||
if (dirp != NULL) {
|
||||
/* release search handle */
|
||||
if (dirp->search_handle != INVALID_HANDLE_VALUE) {
|
||||
FindClose (dirp->search_handle);
|
||||
}
|
||||
|
||||
/* open new search handle and retrieve the first entry */
|
||||
dirp->search_handle = FindFirstFileA (dirp->patt, &dirp->find_data);
|
||||
if (dirp->search_handle != INVALID_HANDLE_VALUE) {
|
||||
/* a directory entry is now waiting in memory */
|
||||
dirp->cached = 1;
|
||||
} else {
|
||||
/* failed to re-open directory: no directory entry in memory */
|
||||
dirp->cached = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif /*DIRENT_H*/
|
||||
@ -9,7 +9,7 @@ BOOST_AUTO_TEST_CASE(test_index)
|
||||
{
|
||||
FileIndex index;
|
||||
|
||||
index.indexDirectory(Global::getGamePath()+"/data");
|
||||
index.indexTree(Global::getGamePath()+"/data");
|
||||
|
||||
FileIndex::IndexData data;
|
||||
BOOST_CHECK( index.findFile("cullzone.dat", data) );
|
||||
@ -22,7 +22,7 @@ BOOST_AUTO_TEST_CASE(test_file)
|
||||
{
|
||||
FileIndex index;
|
||||
|
||||
index.indexDirectory(Global::getGamePath()+"/data");
|
||||
index.indexTree(Global::getGamePath()+"/data");
|
||||
|
||||
auto handle = index.openFile("cullzone.dat");
|
||||
BOOST_CHECK( handle != nullptr );
|
||||
|
||||
Loading…
Reference in New Issue
Block a user