X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=fs.h;h=b8ada8b990b831b04c55441845e96958da262d59;hp=7ffba78eab5c028eaa756bec7be349dcdeb4fdcd;hb=c9c011dcf7b2ee062e9493139b89fff99f63ea25;hpb=1ea860909ea670451b5200ccd30aa19241cd081a diff --git a/fs.h b/fs.h index 7ffba78e..b8ada8b9 100644 --- a/fs.h +++ b/fs.h @@ -25,19 +25,16 @@ #ifndef FS_H #define FS_H +#include +#include +#include "qtypes.h" +#include "qdefs.h" +#include "zone.h" // ------ Types ------ // typedef struct qfile_s qfile_t; - -#ifdef WIN32 -//typedef long fs_offset_t; // 32bit -typedef __int64 fs_offset_t; ///< 64bit (lots of warnings, and read/write still don't take 64bit on win64) -#else -typedef long long fs_offset_t; -#endif - - +typedef int64_t fs_offset_t; // ------ Variables ------ // @@ -50,20 +47,28 @@ extern char fs_userdir [MAX_OSPATH]; extern int fs_numgamedirs; extern char fs_gamedirs[MAX_GAMEDIRS][MAX_QPATH]; +typedef struct vfs_s +{ + char gamedir[MAX_OSPATH]; + char basedir[MAX_OSPATH]; + char userdir[MAX_OSPATH]; + int numgamedirs; + char gamedirs[MAX_GAMEDIRS][MAX_QPATH]; +} vfs_t; // ------ Main functions ------ // // IMPORTANT: the file path is automatically prefixed by the current game directory for // each file created by FS_WriteFile, or opened in "write" or "append" mode by FS_OpenRealFile -qboolean FS_AddPack(const char *pakfile, qboolean *already_loaded, qboolean keep_plain_dirs); // already_loaded may be NULL if caller does not care +qbool FS_AddPack(const char *pakfile, qbool *already_loaded, qbool keep_plain_dirs); // already_loaded may be NULL if caller does not care const char *FS_WhichPack(const char *filename); void FS_CreatePath (char *path); -int FS_SysOpenFD(const char *filepath, const char *mode, qboolean nonblocking); // uses absolute path -qfile_t* FS_SysOpen (const char* filepath, const char* mode, qboolean nonblocking); // uses absolute path -qfile_t* FS_OpenRealFile (const char* filepath, const char* mode, qboolean quiet); -qfile_t* FS_OpenVirtualFile (const char* filepath, qboolean quiet); -qfile_t* FS_FileFromData (const unsigned char *data, const size_t size, qboolean quiet); +int FS_SysOpenFD(const char *filepath, const char *mode, qbool nonblocking); // uses absolute path +qfile_t* FS_SysOpen (const char* filepath, const char* mode, qbool nonblocking); // uses absolute path +qfile_t* FS_OpenRealFile (const char* filepath, const char* mode, qbool quiet); +qfile_t* FS_OpenVirtualFile (const char* filepath, qbool quiet); +qfile_t* FS_FileFromData (const unsigned char *data, const size_t size, qbool quiet); int FS_Close (qfile_t* file); void FS_RemoveOnClose(qfile_t* file); fs_offset_t FS_Write (qfile_t* file, const void* data, size_t datasize); @@ -79,7 +84,8 @@ fs_offset_t FS_FileSize (qfile_t* file); void FS_Purge (qfile_t* file); const char *FS_FileWithoutPath (const char *in); const char *FS_FileExtension (const char *in); -int FS_CheckNastyPath (const char *path, qboolean isgamedir); +int FS_CheckNastyPath (const char *path, qbool isgamedir); +void FS_SanitizePath (char *path); extern const char *const fs_checkgamedir_missing; // "(missing)" const char *FS_CheckGameDir(const char *gamedir); // returns NULL if nasty, fs_checkgamedir_missing (exact pointer) if missing @@ -93,8 +99,8 @@ gamedir_t; extern gamedir_t *fs_all_gamedirs; // terminated by entry with empty name extern int fs_all_gamedirs_count; -qboolean FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qboolean complain, qboolean failmissing); -qboolean FS_IsRegisteredQuakePack(const char *name); +qbool FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qbool complain, qbool failmissing); +qbool FS_IsRegisteredQuakePack(const char *name); int FS_CRCFile(const char *filename, size_t *filesizepointer); void FS_Rescan(void); @@ -107,12 +113,13 @@ typedef struct fssearch_s } fssearch_t; -fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet); +fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet, const char *packfile); void FS_FreeSearch(fssearch_t *search); -unsigned char *FS_LoadFile (const char *path, mempool_t *pool, qboolean quiet, fs_offset_t *filesizepointer); -qboolean FS_WriteFileInBlocks (const char *filename, const void *const *data, const fs_offset_t *len, size_t count); -qboolean FS_WriteFile (const char *filename, const void *data, fs_offset_t len); +unsigned char *FS_LoadFile (const char *path, mempool_t *pool, qbool quiet, fs_offset_t *filesizepointer); +unsigned char *FS_SysLoadFile (const char *path, mempool_t *pool, qbool quiet, fs_offset_t *filesizepointer); +qbool FS_WriteFileInBlocks (const char *filename, const void *const *data, const fs_offset_t *len, size_t count); +qbool FS_WriteFile (const char *filename, const void *data, fs_offset_t len); // ------ Other functions ------ // @@ -126,14 +133,17 @@ void FS_DefaultExtension (char *path, const char *extension, size_t size_path); int FS_FileType (const char *filename); // the file can be into a package int FS_SysFileType (const char *filename); // only look for files outside of packages -qboolean FS_FileExists (const char *filename); // the file can be into a package -qboolean FS_SysFileExists (const char *filename); // only look for files outside of packages - -void FS_mkdir (const char *path); +qbool FS_FileExists (const char *filename); // the file can be into a package +qbool FS_SysFileExists (const char *filename); // only look for files outside of packages unsigned char *FS_Deflate(const unsigned char *data, size_t size, size_t *deflated_size, int level, mempool_t *mempool); unsigned char *FS_Inflate(const unsigned char *data, size_t size, size_t *inflated_size, mempool_t *mempool); -qboolean FS_HasZlib(void); +qbool FS_HasZlib(void); + +void FS_Init_SelfPack(void); +void FS_Init(void); +void FS_Shutdown(void); +void FS_Init_Commands(void); #endif