X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=fs.h;h=b8ada8b990b831b04c55441845e96958da262d59;hp=755e5c5046b5722f03c7249c91cf9e9436758824;hb=0dfd3a30839fefb7c1d817618354350f4efd1131;hpb=e9ef9da90a206204b283dacd15c35bd3fd1fe5c9 diff --git a/fs.h b/fs.h index 755e5c50..b8ada8b9 100644 --- a/fs.h +++ b/fs.h @@ -34,15 +34,7 @@ // ------ 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 ------ // @@ -55,6 +47,14 @@ 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 ------ // @@ -85,6 +85,7 @@ 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, 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