janwas
a859562ea7
- properly differentiate between buffer/offset alignment and length alignment (relevant since block size has been increased to 256k) - use VfsPath for most game paths instead of CStr - clean up timer interface and implementation - self-tests no longer crash - file_cache.cpp: fix for the case where allocation fails (prevent deleter from seeing a null pointer) - allocators: move all shared_ptr-related stuff to its own component; add DummySharedPtr - codec: disable checksums (important for performance at work) - File: made into an interface class to avoid export problems. not entirely sure about this.. - vfs_path.h, path.h, os_path.h: proper fix for using fs::change_extension and similar utility functions with derivatives of basic_path - lib_api: automatically link against import lib if building lib/ as a DLL - path_util: remove unused functions (this component is deprecated) - compiler.h: add INLINE - Xeromyces.cpp: pass PIVFS so that GetXMBPath works in self-test (should do this mostly everywhere rather than have one singleton g_VFS) This was SVN commit r5537.
72 lines
1.4 KiB
C++
72 lines
1.4 KiB
C++
#include "precompiled.h"
|
|
#include "Filesystem.h"
|
|
|
|
#include "ps/CLogger.h"
|
|
|
|
#define LOG_CATEGORY "file"
|
|
|
|
|
|
PIVFS g_VFS;
|
|
|
|
bool FileExists(const char* pathname)
|
|
{
|
|
return g_VFS->GetFileInfo(pathname, 0) == INFO::OK;
|
|
}
|
|
|
|
bool FileExists(const VfsPath& pathname)
|
|
{
|
|
return g_VFS->GetFileInfo(pathname, 0) == INFO::OK;
|
|
}
|
|
|
|
|
|
|
|
CVFSFile::CVFSFile()
|
|
{
|
|
}
|
|
|
|
CVFSFile::~CVFSFile()
|
|
{
|
|
}
|
|
|
|
PSRETURN CVFSFile::Load(const VfsPath& filename)
|
|
{
|
|
// Load should never be called more than once, so complain
|
|
if (m_Buffer)
|
|
{
|
|
debug_assert(0);
|
|
return PSRETURN_CVFSFile_AlreadyLoaded;
|
|
}
|
|
|
|
LibError ret = g_VFS->LoadFile(filename, m_Buffer, m_BufferSize);
|
|
if (ret != INFO::OK)
|
|
{
|
|
LOG(CLogger::Error, LOG_CATEGORY, "CVFSFile: file %s couldn't be opened (vfs_load: %d)", filename.string().c_str(), ret);
|
|
return PSRETURN_CVFSFile_LoadFailed;
|
|
}
|
|
|
|
return PSRETURN_OK;
|
|
}
|
|
|
|
const u8* CVFSFile::GetBuffer() const
|
|
{
|
|
// Die in a very obvious way, to avoid subtle problems caused by
|
|
// accidentally forgetting to check that the open succeeded
|
|
if (!m_Buffer)
|
|
{
|
|
debug_warn("GetBuffer() called with no file loaded");
|
|
throw PSERROR_CVFSFile_InvalidBufferAccess();
|
|
}
|
|
|
|
return m_Buffer.get();
|
|
}
|
|
|
|
size_t CVFSFile::GetBufferSize() const
|
|
{
|
|
return m_BufferSize;
|
|
}
|
|
|
|
CStr CVFSFile::GetAsString() const
|
|
{
|
|
return std::string((char*)GetBuffer(), GetBufferSize());
|
|
}
|