/*
DarkPlaces file system
- Copyright (C) 2003-2005 Mathieu Olivier
- Copyright (C) 1999,2000 contributors of the QuakeForge project
+ Copyright (C) 2003-2006 Mathieu Olivier
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
#ifdef WIN32
# include <direct.h>
# include <io.h>
+# include <shlobj.h>
#else
# include <pwd.h>
# include <sys/stat.h>
#endif
#include "fs.h"
+#include "wad.h"
// Win32 requires us to add O_BINARY, but the other OSes don't have it
#ifndef O_BINARY
# define O_BINARY 0
#endif
+// In case the system doesn't support the O_NONBLOCK flag
+#ifndef O_NONBLOCK
+# define O_NONBLOCK 0
+#endif
+
+// largefile support for Win32
+#ifdef WIN32
+# define lseek _lseeki64
+#endif
/*
#define MAX_WBITS 15
#define Z_OK 0
#define Z_STREAM_END 1
-#define ZLIB_VERSION "1.1.4"
+#define ZLIB_VERSION "1.2.3"
+
+// Uncomment the following line if the zlib DLL you have still uses
+// the 1.1.x series calling convention on Win32 (WINAPI)
+//#define ZLIB_USES_WINAPI
/*
// been cast to "void*" for a matter of simplicity
typedef struct
{
- qbyte *next_in; // next input byte
+ unsigned char *next_in; // next input byte
unsigned int avail_in; // number of bytes available at next_in
unsigned long total_in; // total nb of input bytes read so far
- qbyte *next_out; // next output byte should be put there
+ unsigned char *next_out; // next output byte should be put there
unsigned int avail_out; // remaining free space at next_out
unsigned long total_out; // total nb of bytes output so far
} z_stream;
-typedef enum
-{
- QFILE_FLAG_NONE = 0,
- QFILE_FLAG_PACKED = (1 << 0), // inside a package (PAK or PK3)
- QFILE_FLAG_DEFLATED = (1 << 1) // file is compressed using the deflate algorithm (PK3 only)
-} qfile_flags_t;
+// inside a package (PAK or PK3)
+#define QFILE_FLAG_PACKED (1 << 0)
+// file is compressed using the deflate algorithm (PK3 only)
+#define QFILE_FLAG_DEFLATED (1 << 1)
#define FILE_BUFF_SIZE 2048
typedef struct
size_t comp_length; // length of the compressed file
size_t in_ind, in_len; // input buffer current index and length
size_t in_position; // position in the compressed file
- qbyte input [FILE_BUFF_SIZE];
+ unsigned char input [FILE_BUFF_SIZE];
} ztoolkit_t;
struct qfile_s
{
- qfile_flags_t flags;
+ int flags;
int handle; // file descriptor
fs_offset_t real_length; // uncompressed file size (for files opened in "read" mode)
fs_offset_t position; // current position in the file
int ungetc; // single stored character from ungetc, cleared to EOF when read
// Contents buffer
- size_t buff_ind, buff_len; // buffer current index and length
- qbyte buff [FILE_BUFF_SIZE];
+ fs_offset_t buff_ind, buff_len; // buffer current index and length
+ unsigned char buff [FILE_BUFF_SIZE];
// For zipped files
ztoolkit_t* ztk;
// You can get the complete ZIP format description from PKWARE website
-typedef struct
+typedef struct pk3_endOfCentralDir_s
{
unsigned int signature;
unsigned short disknum;
// ------ PAK files on disk ------ //
-typedef struct
+typedef struct dpackfile_s
{
char name[56];
int filepos, filelen;
} dpackfile_t;
-typedef struct
+typedef struct dpackheader_s
{
char id[4];
int dirofs;
// Packages in memory
-typedef enum
-{
- PACKFILE_FLAG_NONE = 0,
- PACKFILE_FLAG_TRUEOFFS = (1 << 0), // the offset in packfile_t is the true contents offset
- PACKFILE_FLAG_DEFLATED = (1 << 1) // file compressed using the deflate algorithm
-} packfile_flags_t;
+// the offset in packfile_t is the true contents offset
+#define PACKFILE_FLAG_TRUEOFFS (1 << 0)
+// file compressed using the deflate algorithm
+#define PACKFILE_FLAG_DEFLATED (1 << 1)
-typedef struct
+typedef struct packfile_s
{
char name [MAX_QPATH];
- packfile_flags_t flags;
- size_t offset;
- size_t packsize; // size in the package
- size_t realsize; // real file size (uncompressed)
+ int flags;
+ fs_offset_t offset;
+ fs_offset_t packsize; // size in the package
+ fs_offset_t realsize; // real file size (uncompressed)
} packfile_t;
typedef struct pack_s
int ignorecase; // PK3 ignores case
int numfiles;
packfile_t *files;
- struct pack_s *next;
} pack_t;
void FS_Dir_f(void);
void FS_Ls_f(void);
+static searchpath_t *FS_FindFile (const char *name, int* index, qboolean quiet);
static packfile_t* FS_AddFileToPack (const char* name, pack_t* pack,
fs_offset_t offset, fs_offset_t packsize,
- fs_offset_t realsize, packfile_flags_t flags);
+ fs_offset_t realsize, int flags);
/*
mempool_t *fs_mempool;
-fs_offset_t fs_filesize;
-
-pack_t *packlist = NULL;
-
searchpath_t *fs_searchpaths = NULL;
#define MAX_FILES_IN_PACK 65536
char fs_gamedir[MAX_OSPATH];
char fs_basedir[MAX_OSPATH];
-qboolean fs_modified; // set true if using non-id files
+// list of active game directories (empty if not running a mod)
+int fs_numgamedirs = 0;
+char fs_gamedirs[MAX_GAMEDIRS][MAX_QPATH];
+
+cvar_t scr_screenshot_name = {0, "scr_screenshot_name","dp", "prefix name for saved screenshots (changes based on -game commandline, as well as which game mode is running)"};
+cvar_t fs_empty_files_in_pack_mark_deletions = {0, "fs_empty_files_in_pack_mark_deletions", "0", "if enabled, empty files in a pak/pk3 count as not existing but cancel the search in further packs, effectively allowing patch pak/pk3 files to 'delete' files"};
/*
*/
// Functions exported from zlib
-#ifdef WIN32
+#if defined(WIN32) && defined(ZLIB_USES_WINAPI)
# define ZEXPORT WINAPI
#else
# define ZEXPORT
{
const char* dllnames [] =
{
-#ifdef WIN32
+#if defined(WIN64)
+ "zlib64.dll",
+#elif defined(WIN32)
+# ifdef ZLIB_USES_WINAPI
+ "zlibwapi.dll",
"zlib.dll",
+# else
+ "zlib1.dll",
+# endif
#elif defined(MACOSX)
"libz.dylib",
#else
return true;
// Load the DLL
- if (! Sys_LoadLibrary (dllnames, &zlib_dll, zlibfuncs))
- {
- Con_Printf ("Compressed files support disabled\n");
- return false;
- }
-
- Con_Printf ("Compressed files support enabled\n");
- return true;
+ return Sys_LoadLibrary (dllnames, &zlib_dll, zlibfuncs);
}
*/
qboolean PK3_GetEndOfCentralDir (const char *packfile, int packhandle, pk3_endOfCentralDir_t *eocd)
{
- long filesize, maxsize;
- qbyte *buffer, *ptr;
+ fs_offset_t filesize, maxsize;
+ unsigned char *buffer, *ptr;
int ind;
// Get the package size
maxsize = filesize;
else
maxsize = ZIP_MAX_COMMENTS_SIZE + ZIP_END_CDIR_SIZE;
- buffer = Mem_Alloc (tempmempool, maxsize);
+ buffer = (unsigned char *)Mem_Alloc (tempmempool, maxsize);
lseek (packhandle, filesize - maxsize, SEEK_SET);
if (read (packhandle, buffer, maxsize) != (fs_offset_t) maxsize)
{
*/
int PK3_BuildFileList (pack_t *pack, const pk3_endOfCentralDir_t *eocd)
{
- qbyte *central_dir, *ptr;
+ unsigned char *central_dir, *ptr;
unsigned int ind;
fs_offset_t remaining;
// Load the central directory in memory
- central_dir = Mem_Alloc (tempmempool, eocd->cdir_size);
+ central_dir = (unsigned char *)Mem_Alloc (tempmempool, eocd->cdir_size);
lseek (pack->handle, eocd->cdir_offset, SEEK_SET);
read (pack->handle, central_dir, eocd->cdir_size);
{
char filename [sizeof (pack->files[0].name)];
fs_offset_t offset, packsize, realsize;
- packfile_flags_t flags;
+ int flags;
// Extract the name (strip it if necessary)
namesize = min(namesize, (int)sizeof (filename) - 1);
if (! PK3_GetEndOfCentralDir (packfile, packhandle, &eocd))
{
- Con_Printf ("%s is not a PK3 file", packfile);
+ Con_Printf ("%s is not a PK3 file\n", packfile);
close(packhandle);
return NULL;
}
// Multi-volume ZIP archives are NOT allowed
if (eocd.disknum != 0 || eocd.cdir_disknum != 0)
{
- Con_Printf ("%s is a multi-volume ZIP archive", packfile);
+ Con_Printf ("%s is a multi-volume ZIP archive\n", packfile);
close(packhandle);
return NULL;
}
#if MAX_FILES_IN_PACK < 65535
if (eocd.nbentries > MAX_FILES_IN_PACK)
{
- Con_Printf ("%s contains too many files (%hu)", packfile, eocd.nbentries);
+ Con_Printf ("%s contains too many files (%hu)\n", packfile, eocd.nbentries);
close(packhandle);
return NULL;
}
#endif
// Create a package structure in memory
- pack = Mem_Alloc(fs_mempool, sizeof (pack_t));
+ pack = (pack_t *)Mem_Alloc(fs_mempool, sizeof (pack_t));
pack->ignorecase = true; // PK3 ignores case
strlcpy (pack->filename, packfile, sizeof (pack->filename));
pack->handle = packhandle;
pack->numfiles = eocd.nbentries;
- pack->files = Mem_Alloc(fs_mempool, eocd.nbentries * sizeof(packfile_t));
- pack->next = packlist;
- packlist = pack;
+ pack->files = (packfile_t *)Mem_Alloc(fs_mempool, eocd.nbentries * sizeof(packfile_t));
real_nb_files = PK3_BuildFileList (pack, &eocd);
if (real_nb_files < 0)
{
- Con_Printf ("%s is not a valid PK3 file", packfile);
+ Con_Printf ("%s is not a valid PK3 file\n", packfile);
close(pack->handle);
Mem_Free(pack);
return NULL;
*/
qboolean PK3_GetTrueFileOffset (packfile_t *pfile, pack_t *pack)
{
- qbyte buffer [ZIP_LOCAL_CHUNK_BASE_SIZE];
+ unsigned char buffer [ZIP_LOCAL_CHUNK_BASE_SIZE];
fs_offset_t count;
// Already found?
count = read (pack->handle, buffer, ZIP_LOCAL_CHUNK_BASE_SIZE);
if (count != ZIP_LOCAL_CHUNK_BASE_SIZE || BuffBigLong (buffer) != ZIP_DATA_HEADER)
{
- Con_Printf ("Can't retrieve file %s in package %s", pfile->name, pack->filename);
+ Con_Printf ("Can't retrieve file %s in package %s\n", pfile->name, pack->filename);
return false;
}
*/
static packfile_t* FS_AddFileToPack (const char* name, pack_t* pack,
fs_offset_t offset, fs_offset_t packsize,
- fs_offset_t realsize, packfile_flags_t flags)
+ fs_offset_t realsize, int flags)
{
int (*strcmp_funct) (const char* str1, const char* str2);
int left, right, middle;
read (packhandle, (void *)&header, sizeof(header));
if (memcmp(header.id, "PACK", 4))
{
- Con_Printf ("%s is not a packfile", packfile);
+ Con_Printf ("%s is not a packfile\n", packfile);
close(packhandle);
return NULL;
}
if (header.dirlen % sizeof(dpackfile_t))
{
- Con_Printf ("%s has an invalid directory size", packfile);
+ Con_Printf ("%s has an invalid directory size\n", packfile);
close(packhandle);
return NULL;
}
if (numpackfiles > MAX_FILES_IN_PACK)
{
- Con_Printf ("%s has %i files", packfile, numpackfiles);
+ Con_Printf ("%s has %i files\n", packfile, numpackfiles);
close(packhandle);
return NULL;
}
- pack = Mem_Alloc(fs_mempool, sizeof (pack_t));
+ info = (dpackfile_t *)Mem_Alloc(tempmempool, sizeof(*info) * numpackfiles);
+ lseek (packhandle, header.dirofs, SEEK_SET);
+ if(header.dirlen != read (packhandle, (void *)info, header.dirlen))
+ {
+ Con_Printf("%s is an incomplete PAK, not loading\n", packfile);
+ Mem_Free(info);
+ close(packhandle);
+ return NULL;
+ }
+
+ pack = (pack_t *)Mem_Alloc(fs_mempool, sizeof (pack_t));
pack->ignorecase = false; // PAK is case sensitive
strlcpy (pack->filename, packfile, sizeof (pack->filename));
pack->handle = packhandle;
pack->numfiles = 0;
- pack->files = Mem_Alloc(fs_mempool, numpackfiles * sizeof(packfile_t));
- pack->next = packlist;
- packlist = pack;
-
- info = Mem_Alloc(tempmempool, sizeof(*info) * numpackfiles);
- lseek (packhandle, header.dirofs, SEEK_SET);
- read (packhandle, (void *)info, header.dirlen);
+ pack->files = (packfile_t *)Mem_Alloc(fs_mempool, numpackfiles * sizeof(packfile_t));
// parse the directory
for (i = 0;i < numpackfiles;i++)
return pack;
}
+/*
+================
+FS_AddPack_Fullpath
+
+Adds the given pack to the search path.
+The pack type is autodetected by the file extension.
+
+Returns true if the file was successfully added to the
+search path or if it was already included.
+
+If keep_plain_dirs is set, the pack will be added AFTER the first sequence of
+plain directories.
+================
+*/
+static qboolean FS_AddPack_Fullpath(const char *pakfile, qboolean *already_loaded, qboolean keep_plain_dirs)
+{
+ searchpath_t *search;
+ pack_t *pak = NULL;
+ const char *ext = FS_FileExtension(pakfile);
+
+ for(search = fs_searchpaths; search; search = search->next)
+ {
+ if(search->pack && !strcasecmp(search->pack->filename, pakfile))
+ {
+ if(already_loaded)
+ *already_loaded = true;
+ return true; // already loaded
+ }
+ }
+
+ if(already_loaded)
+ *already_loaded = false;
+
+ if(!strcasecmp(ext, "pak"))
+ pak = FS_LoadPackPAK (pakfile);
+ else if(!strcasecmp(ext, "pk3"))
+ pak = FS_LoadPackPK3 (pakfile);
+ else
+ Con_Printf("\"%s\" does not have a pack extension\n", pakfile);
+
+ if (pak)
+ {
+ if(keep_plain_dirs)
+ {
+ // find the first item whose next one is a pack or NULL
+ searchpath_t *insertion_point = 0;
+ if(fs_searchpaths && !fs_searchpaths->pack)
+ {
+ insertion_point = fs_searchpaths;
+ for(;;)
+ {
+ if(!insertion_point->next)
+ break;
+ if(insertion_point->next->pack)
+ break;
+ insertion_point = insertion_point->next;
+ }
+ }
+ // If insertion_point is NULL, this means that either there is no
+ // item in the list yet, or that the very first item is a pack. In
+ // that case, we want to insert at the beginning...
+ if(!insertion_point)
+ {
+ search = (searchpath_t *)Mem_Alloc(fs_mempool, sizeof(searchpath_t));
+ search->pack = pak;
+ search->next = fs_searchpaths;
+ fs_searchpaths = search;
+ }
+ else
+ // otherwise we want to append directly after insertion_point.
+ {
+ search = (searchpath_t *)Mem_Alloc(fs_mempool, sizeof(searchpath_t));
+ search->pack = pak;
+ search->next = insertion_point->next;
+ insertion_point->next = search;
+ }
+ }
+ else
+ {
+ search = (searchpath_t *)Mem_Alloc(fs_mempool, sizeof(searchpath_t));
+ search->pack = pak;
+ search->next = fs_searchpaths;
+ fs_searchpaths = search;
+ }
+ return true;
+ }
+ else
+ {
+ Con_Printf("unable to load pak \"%s\"\n", pakfile);
+ return false;
+ }
+}
+
+
+/*
+================
+FS_AddPack
+
+Adds the given pack to the search path and searches for it in the game path.
+The pack type is autodetected by the file extension.
+
+Returns true if the file was successfully added to the
+search path or if it was already included.
+
+If keep_plain_dirs is set, the pack will be added AFTER the first sequence of
+plain directories.
+================
+*/
+qboolean FS_AddPack(const char *pakfile, qboolean *already_loaded, qboolean keep_plain_dirs)
+{
+ char fullpath[MAX_QPATH];
+ int index;
+ searchpath_t *search;
+
+ if(already_loaded)
+ *already_loaded = false;
+
+ // then find the real name...
+ search = FS_FindFile(pakfile, &index, true);
+ if(!search || search->pack)
+ {
+ Con_Printf("could not find pak \"%s\"\n", pakfile);
+ return false;
+ }
+
+ dpsnprintf(fullpath, sizeof(fullpath), "%s%s", search->filename, pakfile);
+
+ return FS_AddPack_Fullpath(fullpath, already_loaded, keep_plain_dirs);
+}
+
/*
================
*/
void FS_AddGameDirectory (const char *dir)
{
- stringlist_t *list, *current;
+ int i;
+ stringlist_t list;
searchpath_t *search;
- pack_t *pak;
- char pakfile[MAX_OSPATH];
strlcpy (fs_gamedir, dir, sizeof (fs_gamedir));
- list = listdirectory(dir);
+ stringlistinit(&list);
+ listdirectory(&list, "", dir);
+ stringlistsort(&list);
// add any PAK package in the directory
- for (current = list;current;current = current->next)
+ for (i = 0;i < list.numstrings;i++)
{
- if (matchpattern(current->text, "*.pak", true))
+ if (!strcasecmp(FS_FileExtension(list.strings[i]), "pak"))
{
- dpsnprintf (pakfile, sizeof (pakfile), "%s%s", dir, current->text);
- pak = FS_LoadPackPAK (pakfile);
- if (pak)
- {
- search = Mem_Alloc(fs_mempool, sizeof(searchpath_t));
- search->pack = pak;
- search->next = fs_searchpaths;
- fs_searchpaths = search;
- }
- else
- Con_Printf("unable to load pak \"%s\"\n", pakfile);
+ FS_AddPack_Fullpath(list.strings[i], NULL, false);
}
}
- // add any PK3 package in the director
- for (current = list;current;current = current->next)
+ // add any PK3 package in the directory
+ for (i = 0;i < list.numstrings;i++)
{
- if (matchpattern(current->text, "*.pk3", true))
+ if (!strcasecmp(FS_FileExtension(list.strings[i]), "pk3"))
{
- dpsnprintf (pakfile, sizeof (pakfile), "%s%s", dir, current->text);
- pak = FS_LoadPackPK3 (pakfile);
- if (pak)
- {
- search = Mem_Alloc(fs_mempool, sizeof(searchpath_t));
- search->pack = pak;
- search->next = fs_searchpaths;
- fs_searchpaths = search;
- }
- else
- Con_Printf("unable to load pak \"%s\"\n", pakfile);
+ FS_AddPack_Fullpath(list.strings[i], NULL, false);
}
}
- freedirectory(list);
+
+ stringlistfreecontents(&list);
// Add the directory to the search path
// (unpacked files have the priority over packed files)
- search = Mem_Alloc(fs_mempool, sizeof(searchpath_t));
+ search = (searchpath_t *)Mem_Alloc(fs_mempool, sizeof(searchpath_t));
strlcpy (search->filename, dir, sizeof (search->filename));
search->next = fs_searchpaths;
fs_searchpaths = search;
*/
void FS_AddGameHierarchy (const char *dir)
{
-#ifndef WIN32
+ int i;
+ char userdir[MAX_QPATH];
+#ifdef WIN32
+ TCHAR mydocsdir[MAX_PATH + 1];
+#else
const char *homedir;
#endif
// Add the common game directory
- FS_AddGameDirectory (va("%s/%s/", fs_basedir, dir));
+ FS_AddGameDirectory (va("%s%s/", fs_basedir, dir));
+
+ *userdir = 0;
-#ifndef WIN32
// Add the personal game directory
+#ifdef WIN32
+ if(SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, 0, mydocsdir) == S_OK)
+ dpsnprintf(userdir, sizeof(userdir), "%s/My Games/%s/", mydocsdir, gameuserdirname);
+#else
homedir = getenv ("HOME");
- if (homedir != NULL && homedir[0] != '\0')
- FS_AddGameDirectory (va("%s/.%s/%s/", homedir, gameuserdirname, dir));
+ if(homedir)
+ dpsnprintf(userdir, sizeof(userdir), "%s/.%s/", homedir, gameuserdirname);
#endif
+
+#ifdef WIN32
+ if(!COM_CheckParm("-mygames"))
+ {
+ int fd = open (va("%s%s/config.cfg", fs_basedir, dir), O_WRONLY | O_CREAT, 0666); // note: no O_TRUNC here!
+ if(fd >= 0)
+ {
+ close(fd);
+ *userdir = 0; // we have write access to the game dir, so let's use it
+ }
+ }
+#endif
+
+ if(COM_CheckParm("-nohome"))
+ *userdir = 0;
+
+ if((i = COM_CheckParm("-userdir")) && i < com_argc - 1)
+ dpsnprintf(userdir, sizeof(userdir), "%s/", com_argv[i+1]);
+
+ if (*userdir)
+ FS_AddGameDirectory(va("%s%s/", userdir, dir));
}
FS_FileExtension
============
*/
-static const char *FS_FileExtension (const char *in)
+const char *FS_FileExtension (const char *in)
{
const char *separator, *backslash, *colon, *dot;
separator = strrchr(in, '/');
backslash = strrchr(in, '\\');
- if (separator < backslash)
+ if (!separator || separator < backslash)
separator = backslash;
colon = strrchr(in, ':');
- if (separator < colon)
+ if (!separator || separator < colon)
separator = colon;
dot = strrchr(in, '.');
- if (dot == NULL || dot < separator)
+ if (dot == NULL || (separator && (dot < separator)))
return "";
return dot + 1;
}
+/*
+============
+FS_FileWithoutPath
+============
+*/
+const char *FS_FileWithoutPath (const char *in)
+{
+ const char *separator, *backslash, *colon;
+
+ separator = strrchr(in, '/');
+ backslash = strrchr(in, '\\');
+ if (!separator || separator < backslash)
+ separator = backslash;
+ colon = strrchr(in, ':');
+ if (!separator || separator < colon)
+ separator = colon;
+ return separator ? separator + 1 : in;
+}
+
+
+/*
+================
+FS_ClearSearchPath
+================
+*/
+void FS_ClearSearchPath (void)
+{
+ // unload all packs and directory information, close all pack files
+ // (if a qfile is still reading a pack it won't be harmed because it used
+ // dup() to get its own handle already)
+ while (fs_searchpaths)
+ {
+ searchpath_t *search = fs_searchpaths;
+ fs_searchpaths = search->next;
+ if (search->pack)
+ {
+ // close the file
+ close(search->pack->handle);
+ // free any memory associated with it
+ if (search->pack->files)
+ Mem_Free(search->pack->files);
+ Mem_Free(search->pack);
+ }
+ Mem_Free(search);
+ }
+}
+
+
+/*
+================
+FS_Rescan
+================
+*/
+void FS_Rescan (void)
+{
+ int i;
+ qboolean fs_modified = false;
+
+ FS_ClearSearchPath();
+
+ // add the game-specific paths
+ // gamedirname1 (typically id1)
+ FS_AddGameHierarchy (gamedirname1);
+ // update the com_modname (used for server info)
+ strlcpy(com_modname, gamedirname1, sizeof(com_modname));
+
+ // add the game-specific path, if any
+ // (only used for mission packs and the like, which should set fs_modified)
+ if (gamedirname2)
+ {
+ fs_modified = true;
+ FS_AddGameHierarchy (gamedirname2);
+ }
+
+ // -game <gamedir>
+ // Adds basedir/gamedir as an override game
+ // LordHavoc: now supports multiple -game directories
+ // set the com_modname (reported in server info)
+ for (i = 0;i < fs_numgamedirs;i++)
+ {
+ fs_modified = true;
+ FS_AddGameHierarchy (fs_gamedirs[i]);
+ // update the com_modname (used server info)
+ strlcpy (com_modname, fs_gamedirs[i], sizeof (com_modname));
+ }
+
+ // set the default screenshot name to either the mod name or the
+ // gamemode screenshot name
+ if (strcmp(com_modname, gamedirname1))
+ Cvar_SetQuick (&scr_screenshot_name, com_modname);
+ else
+ Cvar_SetQuick (&scr_screenshot_name, gamescreenshotname);
+
+ // If "-condebug" is in the command line, remove the previous log file
+ if (COM_CheckParm ("-condebug") != 0)
+ unlink (va("%s/qconsole.log", fs_gamedir));
+
+ // look for the pop.lmp file and set registered to true if it is found
+ if ((gamemode == GAME_NORMAL || gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE) && !FS_FileExists("gfx/pop.lmp"))
+ {
+ if (fs_modified)
+ Con_Print("Playing shareware version, with modification.\nwarning: most mods require full quake data.\n");
+ else
+ Con_Print("Playing shareware version.\n");
+ }
+ else
+ {
+ Cvar_Set ("registered", "1");
+ if (gamemode == GAME_NORMAL || gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE)
+ Con_Print("Playing registered version.\n");
+ }
+
+ // unload all wads so that future queries will return the new data
+ W_UnloadAll();
+}
+
+void FS_Rescan_f(void)
+{
+ FS_Rescan();
+}
+
+/*
+================
+FS_ChangeGameDirs
+================
+*/
+extern void Host_SaveConfig (void);
+extern void Host_LoadConfig_f (void);
+qboolean FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qboolean complain, qboolean failmissing)
+{
+ int i;
+
+ if (fs_numgamedirs == numgamedirs)
+ {
+ for (i = 0;i < numgamedirs;i++)
+ if (strcasecmp(fs_gamedirs[i], gamedirs[i]))
+ break;
+ if (i == numgamedirs)
+ return true; // already using this set of gamedirs, do nothing
+ }
+
+ if (numgamedirs > MAX_GAMEDIRS)
+ {
+ if (complain)
+ Con_Printf("That is too many gamedirs (%i > %i)\n", numgamedirs, MAX_GAMEDIRS);
+ return false; // too many gamedirs
+ }
+
+ for (i = 0;i < numgamedirs;i++)
+ {
+ // if string is nasty, reject it
+ if(FS_CheckNastyPath(gamedirs[i], true))
+ {
+ if (complain)
+ Con_Printf("Nasty gamedir name rejected: %s\n", gamedirs[i]);
+ return false; // nasty gamedirs
+ }
+ }
+
+ for (i = 0;i < numgamedirs;i++)
+ {
+ if (!FS_CheckGameDir(gamedirs[i]) && failmissing)
+ {
+ if (complain)
+ Con_Printf("Gamedir missing: %s%s/\n", fs_basedir, gamedirs[i]);
+ return false; // missing gamedirs
+ }
+ }
+
+ Host_SaveConfig();
+
+ fs_numgamedirs = numgamedirs;
+ for (i = 0;i < fs_numgamedirs;i++)
+ strlcpy(fs_gamedirs[i], gamedirs[i], sizeof(fs_gamedirs[i]));
+
+ // reinitialize filesystem to detect the new paks
+ FS_Rescan();
+
+ // exec the new config
+ Host_LoadConfig_f();
+
+ // unload all sounds so they will be reloaded from the new files as needed
+ S_UnloadAllSounds_f();
+
+ // reinitialize renderer (this reloads hud/console background/etc)
+ R_Modules_Restart();
+
+ return true;
+}
+
+/*
+================
+FS_GameDir_f
+================
+*/
+void FS_GameDir_f (void)
+{
+ int i;
+ int numgamedirs;
+ char gamedirs[MAX_GAMEDIRS][MAX_QPATH];
+
+ if (Cmd_Argc() < 2)
+ {
+ Con_Printf("gamedirs active:");
+ for (i = 0;i < fs_numgamedirs;i++)
+ Con_Printf(" %s", fs_gamedirs[i]);
+ Con_Printf("\n");
+ return;
+ }
+
+ numgamedirs = Cmd_Argc() - 1;
+ if (numgamedirs > MAX_GAMEDIRS)
+ {
+ Con_Printf("Too many gamedirs (%i > %i)\n", numgamedirs, MAX_GAMEDIRS);
+ return;
+ }
+
+ for (i = 0;i < numgamedirs;i++)
+ strlcpy(gamedirs[i], Cmd_Argv(i+1), sizeof(gamedirs[i]));
+
+ if ((cls.state == ca_connected && !cls.demoplayback) || sv.active)
+ {
+ // actually, changing during game would work fine, but would be stupid
+ Con_Printf("Can not change gamedir while client is connected or server is running!\n");
+ return;
+ }
+
+ // halt demo playback to close the file
+ CL_Disconnect();
+
+ FS_ChangeGameDirs(numgamedirs, gamedirs, true, true);
+}
+
+
+/*
+================
+FS_CheckGameDir
+================
+*/
+qboolean FS_CheckGameDir(const char *gamedir)
+{
+ qboolean success;
+ stringlist_t list;
+ stringlistinit(&list);
+ listdirectory(&list, va("%s%s/", fs_basedir, gamedir), "");
+ success = list.numstrings > 0;
+ stringlistfreecontents(&list);
+ return success;
+}
+
+
/*
================
FS_Init
void FS_Init (void)
{
int i;
- searchpath_t *search;
fs_mempool = Mem_AllocPool("file management", 0, NULL);
- strcpy(fs_basedir, ".");
- strcpy(fs_gamedir, "");
+ strlcpy(fs_gamedir, "", sizeof(fs_gamedir));
+
+// If the base directory is explicitly defined by the compilation process
+#ifdef DP_FS_BASEDIR
+ strlcpy(fs_basedir, DP_FS_BASEDIR, sizeof(fs_basedir));
+#else
+ strlcpy(fs_basedir, "", sizeof(fs_basedir));
#ifdef MACOSX
// FIXME: is there a better way to find the directory outside the .app?
if (strstr(com_argv[0], ".app/"))
{
char *split;
- char temp[4096];
+
split = strstr(com_argv[0], ".app/");
while (split > com_argv[0] && *split != '/')
split--;
strlcpy(fs_basedir, com_argv[0], sizeof(fs_basedir));
fs_basedir[split - com_argv[0]] = 0;
}
+#endif
#endif
PK3_OpenLibrary ();
fs_basedir[i-1] = 0;
}
- // -path <dir or packfile> [<dir or packfile>] ...
- // Fully specifies the exact search path, overriding the generated one
-// COMMANDLINEOPTION: Filesystem: -path <path ..> specifies the full search path manually, overriding the generated one, example: -path c:\quake\id1 c:\quake\pak0.pak c:\quake\pak1.pak (not recommended)
- i = COM_CheckParm ("-path");
- if (i)
- {
- fs_modified = true;
- while (++i < com_argc)
- {
- if (!com_argv[i] || com_argv[i][0] == '+' || com_argv[i][0] == '-')
- break;
+ // add a path separator to the end of the basedir if it lacks one
+ if (fs_basedir[0] && fs_basedir[strlen(fs_basedir) - 1] != '/' && fs_basedir[strlen(fs_basedir) - 1] != '\\')
+ strlcat(fs_basedir, "/", sizeof(fs_basedir));
- search = Mem_Alloc(fs_mempool, sizeof(searchpath_t));
- if (!strcasecmp (FS_FileExtension(com_argv[i]), "pak"))
- {
- search->pack = FS_LoadPackPAK (com_argv[i]);
- if (!search->pack)
- {
- Con_Printf ("Couldn't load packfile: %s", com_argv[i]);
- Mem_Free(search);
- continue;
- }
- }
- else if (!strcasecmp (FS_FileExtension (com_argv[i]), "pk3"))
- {
- search->pack = FS_LoadPackPK3 (com_argv[i]);
- if (!search->pack)
- {
- Con_Printf ("Couldn't load packfile: %s", com_argv[i]);
- Mem_Free(search);
- continue;
- }
- }
- else
- strlcpy (search->filename, com_argv[i], sizeof (search->filename));
- search->next = fs_searchpaths;
- fs_searchpaths = search;
- }
- return;
- }
+ if (!FS_CheckGameDir(gamedirname1))
+ Con_Printf("WARNING: base gamedir %s%s/ not found!\n", fs_basedir, gamedirname1);
- // add the game-specific paths
- // gamedirname1 (typically id1)
- FS_AddGameHierarchy (gamedirname1);
-
- // add the game-specific path, if any
- if (gamedirname2)
- {
- fs_modified = true;
- FS_AddGameHierarchy (gamedirname2);
- }
-
- // set the com_modname (reported in server info)
- strlcpy(com_modname, gamedirname1, sizeof(com_modname));
+ if (gamedirname2 && !FS_CheckGameDir(gamedirname2))
+ Con_Printf("WARNING: base gamedir %s%s/ not found!\n", fs_basedir, gamedirname2);
// -game <gamedir>
// Adds basedir/gamedir as an override game
// LordHavoc: now supports multiple -game directories
- for (i = 1;i < com_argc;i++)
+ for (i = 1;i < com_argc && fs_numgamedirs < MAX_GAMEDIRS;i++)
{
if (!com_argv[i])
continue;
if (!strcmp (com_argv[i], "-game") && i < com_argc-1)
{
i++;
- fs_modified = true;
- FS_AddGameHierarchy (com_argv[i]);
- // update the com_modname
- strlcpy (com_modname, com_argv[i], sizeof (com_modname));
+ if (FS_CheckNastyPath(com_argv[i], true))
+ Sys_Error("-game %s%s/ is a dangerous/non-portable path\n", fs_basedir, com_argv[i]);
+ if (!FS_CheckGameDir(com_argv[i]))
+ Con_Printf("WARNING: -game %s%s/ not found!\n", fs_basedir, com_argv[i]);
+ // add the gamedir to the list of active gamedirs
+ strlcpy (fs_gamedirs[fs_numgamedirs], com_argv[i], sizeof(fs_gamedirs[fs_numgamedirs]));
+ fs_numgamedirs++;
}
}
- // If "-condebug" is in the command line, remove the previous log file
- if (COM_CheckParm ("-condebug") != 0)
- unlink (va("%s/qconsole.log", fs_gamedir));
+ // generate the searchpath
+ FS_Rescan();
}
void FS_Init_Commands(void)
{
Cvar_RegisterVariable (&scr_screenshot_name);
+ Cvar_RegisterVariable (&fs_empty_files_in_pack_mark_deletions);
- Cmd_AddCommand ("path", FS_Path_f);
- Cmd_AddCommand ("dir", FS_Dir_f);
- Cmd_AddCommand ("ls", FS_Ls_f);
-
- // set the default screenshot name to either the mod name or the
- // gamemode screenshot name
- if (fs_modified)
- Cvar_SetQuick (&scr_screenshot_name, com_modname);
- else
- Cvar_SetQuick (&scr_screenshot_name, gamescreenshotname);
+ Cmd_AddCommand ("gamedir", FS_GameDir_f, "changes active gamedir list (can take multiple arguments), not including base directory (example usage: gamedir ctf)");
+ Cmd_AddCommand ("fs_rescan", FS_Rescan_f, "rescans filesystem for new pack archives and any other changes");
+ Cmd_AddCommand ("path", FS_Path_f, "print searchpath (game directories and archives)");
+ Cmd_AddCommand ("dir", FS_Dir_f, "list files in searchpath matching an * filename pattern, one per line");
+ Cmd_AddCommand ("ls", FS_Ls_f, "list files in searchpath matching an * filename pattern, multiple per line");
}
/*
*/
void FS_Shutdown (void)
{
+ // close all pack files and such
+ // (hopefully there aren't any other open files, but they'll be cleaned up
+ // by the OS anyway)
+ FS_ClearSearchPath();
Mem_FreePool (&fs_mempool);
}
}
}
-#ifndef WIN32
if (nonblocking)
opt |= O_NONBLOCK;
-#endif
- file = Mem_Alloc (fs_mempool, sizeof (*file));
+ file = (qfile_t *)Mem_Alloc (fs_mempool, sizeof (*file));
memset (file, 0, sizeof (*file));
file->ungetc = EOF;
pfile = &pack->files[pack_ind];
- fs_filesize = 0;
-
// If we don't have the true offset, get it now
if (! (pfile->flags & PACKFILE_FLAG_TRUEOFFS))
if (!PK3_GetTrueFileOffset (pfile, pack))
// the dup() call to avoid having to close the dup_handle on error here
if (lseek (pack->handle, pfile->offset, SEEK_SET) == -1)
{
- Con_Printf ("FS_OpenPackedFile: can't lseek to %s in %s (offset: %d)",
- pfile->name, pack->filename, pfile->offset);
+ Con_Printf ("FS_OpenPackedFile: can't lseek to %s in %s (offset: %d)\n",
+ pfile->name, pack->filename, (int) pfile->offset);
return NULL;
}
dup_handle = dup (pack->handle);
if (dup_handle < 0)
{
- Con_Printf ("FS_OpenPackedFile: can't dup package's handle (pack: %s)", pack->filename);
+ Con_Printf ("FS_OpenPackedFile: can't dup package's handle (pack: %s)\n", pack->filename);
return NULL;
}
- file = Mem_Alloc (fs_mempool, sizeof (*file));
+ file = (qfile_t *)Mem_Alloc (fs_mempool, sizeof (*file));
memset (file, 0, sizeof (*file));
file->handle = dup_handle;
file->flags = QFILE_FLAG_PACKED;
file->flags |= QFILE_FLAG_DEFLATED;
// We need some more variables
- ztk = Mem_Alloc (fs_mempool, sizeof (*ztk));
+ ztk = (ztoolkit_t *)Mem_Alloc (fs_mempool, sizeof (*ztk));
ztk->comp_length = pfile->packsize;
*/
if (qz_inflateInit2 (&ztk->zstream, -MAX_WBITS) != Z_OK)
{
- Con_Printf ("FS_OpenPackedFile: inflate init error (file: %s)", pfile->name);
+ Con_Printf ("FS_OpenPackedFile: inflate init error (file: %s)\n", pfile->name);
close(dup_handle);
Mem_Free(file);
return NULL;
file->ztk = ztk;
}
- fs_filesize = pfile->realsize;
-
return file;
}
or are just not a good idea for a mod to be using.
====================
*/
-int FS_CheckNastyPath (const char *path)
+int FS_CheckNastyPath (const char *path, qboolean isgamedir)
{
+ // all: never allow an empty path, as for gamedir it would access the parent directory and a non-gamedir path it is just useless
+ if (!path[0])
+ return 2;
+
// Windows: don't allow \ in filenames (windows-only), period.
// (on Windows \ is a directory separator, but / is also supported)
if (strstr(path, "\\"))
if (strstr(path, "//"))
return 1; // non-portable attempt to go to parent directory
- // all: don't allow going to current directory (./) or parent directory (../ or /../)
- if (strstr(path, "./"))
+ // all: don't allow going to parent directory (../ or /../)
+ if (strstr(path, ".."))
return 2; // attempt to go outside the game directory
// Windows and UNIXes: don't allow absolute paths
if (path[0] == '/')
return 2; // attempt to go outside the game directory
+ // all: don't allow . characters before the last slash (it should only be used in filenames, not path elements), this catches all imaginable cases of ./, ../, .../, etc
+ if (strchr(path, '.'))
+ {
+ if (isgamedir)
+ {
+ // gamedir is entirely path elements, so simply forbid . entirely
+ return 2;
+ }
+ if (strchr(path, '.') < strrchr(path, '/'))
+ return 2; // possible attempt to go outside the game directory
+ }
+
+ // all: forbid trailing slash on gamedir
+ if (isgamedir && path[strlen(path)-1] == '/')
+ return 2;
+
+ // all: forbid leading dot on any filename for any reason
+ if (strstr(path, "/."))
+ return 2; // attempt to go outside the game directory
+
// after all these checks we're pretty sure it's a / separated filename
// and won't do much if any harm
return false;
// Found it
if (!diff)
{
- if (!quiet)
- Con_DPrintf("FS_FindFile: %s in %s\n",
+ if (fs_empty_files_in_pack_mark_deletions.integer && pak->files[middle].realsize == 0)
+ {
+ // yes, but the first one is empty so we treat it as not being there
+ if (!quiet && developer.integer >= 10)
+ Con_Printf("FS_FindFile: %s is marked as deleted\n", name);
+
+ if (index != NULL)
+ *index = -1;
+ return NULL;
+ }
+
+ if (!quiet && developer.integer >= 10)
+ Con_Printf("FS_FindFile: %s in %s\n",
pak->files[middle].name, pak->filename);
if (index != NULL)
dpsnprintf(netpath, sizeof(netpath), "%s%s", search->filename, name);
if (FS_SysFileExists (netpath))
{
- if (!quiet)
- Con_DPrintf("FS_FindFile: %s\n", netpath);
+ if (!quiet && developer.integer >= 10)
+ Con_Printf("FS_FindFile: %s\n", netpath);
if (index != NULL)
*index = -1;
}
}
- if (!quiet)
- Con_DPrintf("FS_FindFile: can't find %s\n", name);
+ if (!quiet && developer.integer >= 10)
+ Con_Printf("FS_FindFile: can't find %s\n", name);
if (index != NULL)
*index = -1;
FS_OpenReadFile
Look for a file in the search paths and open it in read-only mode
-
-Sets fs_filesize
===========
*/
qfile_t *FS_OpenReadFile (const char *filename, qboolean quiet, qboolean nonblocking)
// Not found?
if (search == NULL)
- {
- fs_filesize = 0;
return NULL;
- }
// Found in the filesystem?
if (pack_ind < 0)
*/
qfile_t* FS_Open (const char* filepath, const char* mode, qboolean quiet, qboolean nonblocking)
{
- qfile_t* file;
-
- if (FS_CheckNastyPath(filepath))
+ if (FS_CheckNastyPath(filepath, false))
{
Con_Printf("FS_Open(\"%s\", \"%s\", %s): nasty filename rejected\n", filepath, mode, quiet ? "true" : "false");
return NULL;
char real_path [MAX_OSPATH];
// Open the file on disk directly
- dpsnprintf (real_path, sizeof (real_path), "%s%s", fs_gamedir, filepath);
+ dpsnprintf (real_path, sizeof (real_path), "%s/%s", fs_gamedir, filepath);
// Create directories up to the file
FS_CreatePath (real_path);
return FS_SysOpen (real_path, mode, nonblocking);
}
-
// Else, we look at the various search paths and open the file in read-only mode
- file = FS_OpenReadFile (filepath, quiet, nonblocking);
- if (file != NULL)
- fs_filesize = file->real_length;
-
- return file;
+ else
+ return FS_OpenReadFile (filepath, quiet, nonblocking);
}
FS_Purge (file);
// Write the buffer and update the position
- result = write (file->handle, data, datasize);
+ result = write (file->handle, data, (fs_offset_t)datasize);
file->position = lseek (file->handle, 0, SEEK_CUR);
if (file->real_length < file->position)
file->real_length = file->position;
if (file->buff_ind < file->buff_len)
{
count = file->buff_len - file->buff_ind;
+ count = ((fs_offset_t)buffersize > count) ? count : (fs_offset_t)buffersize;
+ done += count;
+ memcpy (buffer, &file->buff[file->buff_ind], count);
+ file->buff_ind += count;
- done += ((fs_offset_t)buffersize > count) ? count : (fs_offset_t)buffersize;
- memcpy (buffer, &file->buff[file->buff_ind], done);
- file->buff_ind += done;
-
- buffersize -= done;
+ buffersize -= count;
if (buffersize == 0)
return done;
}
// If the file isn't compressed
if (! (file->flags & QFILE_FLAG_DEFLATED))
{
- int nb;
+ fs_offset_t nb;
// We must take care to not read after the end of the file
count = file->real_length - file->position;
if (count > (fs_offset_t)buffersize)
count = (fs_offset_t)buffersize;
lseek (file->handle, file->offset + file->position, SEEK_SET);
- nb = read (file->handle, &((qbyte*)buffer)[done], count);
+ nb = read (file->handle, &((unsigned char*)buffer)[done], count);
if (nb > 0)
{
done += nb;
file->position += nb;
// Copy the requested data in "buffer" (as much as we can)
- count = (buffersize > file->buff_len) ? file->buff_len : buffersize;
- memcpy (&((qbyte*)buffer)[done], file->buff, count);
+ count = (fs_offset_t)buffersize > file->buff_len ? file->buff_len : (fs_offset_t)buffersize;
+ memcpy (&((unsigned char*)buffer)[done], file->buff, count);
file->buff_ind = count;
done += count;
}
if (file->position == file->real_length)
return done;
- count = ztk->comp_length - ztk->in_position;
+ count = (fs_offset_t)(ztk->comp_length - ztk->in_position);
if (count > (fs_offset_t)sizeof (ztk->input))
count = (fs_offset_t)sizeof (ztk->input);
- lseek (file->handle, file->offset + ztk->in_position, SEEK_SET);
- if (read (file->handle, ztk->input, count) != (fs_offset_t)count)
+ lseek (file->handle, file->offset + (fs_offset_t)ztk->in_position, SEEK_SET);
+ if (read (file->handle, ztk->input, count) != count)
{
- Con_Printf ("FS_Read: unexpected end of file");
+ Con_Printf ("FS_Read: unexpected end of file\n");
break;
}
error = qz_inflate (&ztk->zstream, Z_SYNC_FLUSH);
if (error != Z_OK && error != Z_STREAM_END)
{
- Con_Printf ("FS_Read: Can't inflate file");
+ Con_Printf ("FS_Read: Can't inflate file\n");
break;
}
ztk->in_ind = ztk->in_len - ztk->zstream.avail_in;
- file->buff_len = sizeof (file->buff) - ztk->zstream.avail_out;
+ file->buff_len = (fs_offset_t)sizeof (file->buff) - ztk->zstream.avail_out;
file->position += file->buff_len;
// Copy the requested data in "buffer" (as much as we can)
- count = (buffersize > file->buff_len) ? file->buff_len : buffersize;
- memcpy (&((qbyte*)buffer)[done], file->buff, count);
+ count = (fs_offset_t)buffersize > file->buff_len ? file->buff_len : (fs_offset_t)buffersize;
+ memcpy (&((unsigned char*)buffer)[done], file->buff, count);
file->buff_ind = count;
}
// Else, we inflate directly in "buffer"
else
{
- ztk->zstream.next_out = &((qbyte*)buffer)[done];
+ ztk->zstream.next_out = &((unsigned char*)buffer)[done];
ztk->zstream.avail_out = (unsigned int)buffersize;
error = qz_inflate (&ztk->zstream, Z_SYNC_FLUSH);
if (error != Z_OK && error != Z_STREAM_END)
{
- Con_Printf ("FS_Read: Can't inflate file");
+ Con_Printf ("FS_Read: Can't inflate file\n");
break;
}
ztk->in_ind = ztk->in_len - ztk->zstream.avail_in;
// How much data did it inflate?
- count = buffersize - ztk->zstream.avail_out;
+ count = (fs_offset_t)(buffersize - ztk->zstream.avail_out);
file->position += count;
// Purge cached data
int FS_VPrintf (qfile_t* file, const char* format, va_list ap)
{
int len;
- fs_offset_t buff_size;
- char *tempbuff = NULL;
+ fs_offset_t buff_size = MAX_INPUTLINE;
+ char *tempbuff;
- buff_size = 1024;
- tempbuff = Mem_Alloc (tempmempool, buff_size);
- len = dpvsnprintf (tempbuff, buff_size, format, ap);
- while (len < 0)
+ for (;;)
{
+ tempbuff = (char *)Mem_Alloc (tempmempool, buff_size);
+ len = dpvsnprintf (tempbuff, buff_size, format, ap);
+ if (len >= 0 && len < buff_size)
+ break;
Mem_Free (tempbuff);
buff_size *= 2;
- tempbuff = Mem_Alloc (tempmempool, buff_size);
- len = dpvsnprintf (tempbuff, buff_size, format, ap);
}
len = write (file->handle, tempbuff, len);
*/
int FS_Getc (qfile_t* file)
{
- char c;
+ unsigned char c;
if (FS_Read (file, &c, 1) != 1)
return EOF;
int FS_Seek (qfile_t* file, fs_offset_t offset, int whence)
{
ztoolkit_t *ztk;
- qbyte* buffer;
+ unsigned char* buffer;
fs_offset_t buffersize;
// Compute the file offset
switch (whence)
{
case SEEK_CUR:
- offset += (long)(file->position - file->buff_len + file->buff_ind);
+ offset += file->position - file->buff_len + file->buff_ind;
break;
case SEEK_SET:
break;
case SEEK_END:
- offset += (long)file->real_length;
+ offset += file->real_length;
break;
default:
return -1;
}
- if (offset < 0 || offset > (long) file->real_length)
+ if (offset < 0 || offset > file->real_length)
return -1;
// If we have the data in our read buffer, we don't need to actually seek
- if (file->position - (fs_offset_t)file->buff_len <= offset
- && offset <= file->position)
+ if (file->position - file->buff_len <= offset && offset <= file->position)
{
file->buff_ind = offset + file->buff_len - file->position;
return 0;
// We need a big buffer to force inflating into it directly
buffersize = 2 * sizeof (file->buff);
- buffer = Mem_Alloc (tempmempool, buffersize);
+ buffer = (unsigned char *)Mem_Alloc (tempmempool, buffersize);
// Skip all data until we reach the requested offset
while (offset > file->position)
}
+/*
+====================
+FS_FileSize
+
+Give the total size of a file
+====================
+*/
+fs_offset_t FS_FileSize (qfile_t* file)
+{
+ return file->real_length;
+}
+
+
/*
====================
FS_Purge
Always appends a 0 byte.
============
*/
-qbyte *FS_LoadFile (const char *path, mempool_t *pool, qboolean quiet)
+unsigned char *FS_LoadFile (const char *path, mempool_t *pool, qboolean quiet, fs_offset_t *filesizepointer)
{
qfile_t *file;
- qbyte *buf;
+ unsigned char *buf = NULL;
+ fs_offset_t filesize = 0;
file = FS_Open (path, "rb", quiet, false);
- if (!file)
- return NULL;
-
- buf = Mem_Alloc (pool, fs_filesize + 1);
- buf[fs_filesize] = '\0';
-
- FS_Read (file, buf, fs_filesize);
- FS_Close (file);
+ if (file)
+ {
+ filesize = file->real_length;
+ buf = (unsigned char *)Mem_Alloc (pool, filesize + 1);
+ buf[filesize] = '\0';
+ FS_Read (file, buf, filesize);
+ FS_Close (file);
+ if (developer_loadfile.integer)
+ Con_Printf("loaded file \"%s\" (%u bytes)\n", path, (unsigned int)filesize);
+ }
+ if (filesizepointer)
+ *filesizepointer = filesize;
return buf;
}
return false;
}
- Con_DPrintf("FS_WriteFile: %s\n", filename);
+ Con_DPrintf("FS_WriteFile: %s (%u bytes)\n", filename, (unsigned int)len);
FS_Write (file, data, len);
FS_Close (file);
return true;
void FS_StripExtension (const char *in, char *out, size_t size_out)
{
char *last = NULL;
+ char currentchar;
if (size_out == 0)
return;
- while (*in && size_out > 1)
+ while ((currentchar = *in) && size_out > 1)
{
- if (*in == '.')
+ if (currentchar == '.')
last = out;
- else if (*in == '/' || *in == '\\' || *in == ':')
+ else if (currentchar == '/' || currentchar == '\\' || currentchar == ':')
last = NULL;
- *out++ = *in++;
+ *out++ = currentchar;
+ in++;
size_out--;
}
if (last)
}
+/*
+==================
+FS_FileType
+
+Look for a file in the packages and in the filesystem
+==================
+*/
+int FS_FileType (const char *filename)
+{
+ searchpath_t *search;
+ char fullpath[MAX_QPATH];
+
+ search = FS_FindFile (filename, NULL, true);
+ if(!search)
+ return FS_FILETYPE_NONE;
+
+ if(search->pack)
+ return FS_FILETYPE_FILE; // TODO can't check directories in paks yet, maybe later
+
+ dpsnprintf(fullpath, sizeof(fullpath), "%s%s", search->filename, filename);
+ return FS_SysFileType(fullpath);
+}
+
+
/*
==================
FS_FileExists
Look for a file in the filesystem only
==================
*/
-qboolean FS_SysFileExists (const char *path)
+int FS_SysFileType (const char *path)
{
#if WIN32
- int desc;
+ DWORD result = GetFileAttributes(path);
- // TODO: use another function instead, to avoid opening the file
- desc = open (path, O_RDONLY | O_BINARY);
- if (desc < 0)
- return false;
+ if(result == INVALID_FILE_ATTRIBUTES)
+ return FS_FILETYPE_NONE;
- close (desc);
- return true;
+ if(result & FILE_ATTRIBUTE_DIRECTORY)
+ return FS_FILETYPE_DIRECTORY;
+
+ return FS_FILETYPE_FILE;
#else
struct stat buf;
if (stat (path,&buf) == -1)
- return false;
+ return FS_FILETYPE_NONE;
- return true;
+ if(S_ISDIR(buf.st_mode))
+ return FS_FILETYPE_DIRECTORY;
+
+ return FS_FILETYPE_FILE;
#endif
}
+qboolean FS_SysFileExists (const char *path)
+{
+ return FS_SysFileType (path) != FS_FILETYPE_NONE;
+}
+
void FS_mkdir (const char *path)
{
#if WIN32
fssearch_t *search;
searchpath_t *searchpath;
pack_t *pak;
- int i, basepathlength, numfiles, numchars;
- stringlist_t *dir, *dirfile, *liststart, *listcurrent, *listtemp;
+ int i, basepathlength, numfiles, numchars, resultlistindex, dirlistindex;
+ stringlist_t resultlist;
+ stringlist_t dirlist;
const char *slash, *backslash, *colon, *separator;
char *basepath;
- char netpath[MAX_OSPATH];
char temp[MAX_OSPATH];
for (i = 0;pattern[i] == '.' || pattern[i] == ':' || pattern[i] == '/' || pattern[i] == '\\';i++)
return NULL;
}
+ stringlistinit(&resultlist);
+ stringlistinit(&dirlist);
search = NULL;
- liststart = NULL;
- listcurrent = NULL;
- listtemp = NULL;
slash = strrchr(pattern, '/');
backslash = strrchr(pattern, '\\');
colon = strrchr(pattern, ':');
separator = max(slash, backslash);
separator = max(separator, colon);
basepathlength = separator ? (separator + 1 - pattern) : 0;
- basepath = Mem_Alloc (tempmempool, basepathlength + 1);
+ basepath = (char *)Mem_Alloc (tempmempool, basepathlength + 1);
if (basepathlength)
memcpy(basepath, pattern, basepathlength);
basepath[basepathlength] = 0;
pak = searchpath->pack;
for (i = 0;i < pak->numfiles;i++)
{
- strcpy(temp, pak->files[i].name);
+ strlcpy(temp, pak->files[i].name, sizeof(temp));
while (temp[0])
{
if (matchpattern(temp, (char *)pattern, true))
{
- for (listtemp = liststart;listtemp;listtemp = listtemp->next)
- if (!strcmp(listtemp->text, temp))
+ for (resultlistindex = 0;resultlistindex < resultlist.numstrings;resultlistindex++)
+ if (!strcmp(resultlist.strings[resultlistindex], temp))
break;
- if (listtemp == NULL)
+ if (resultlistindex == resultlist.numstrings)
{
- listcurrent = stringlistappend(listcurrent, temp);
- if (liststart == NULL)
- liststart = listcurrent;
- if (!quiet)
- Con_DPrintf("SearchPackFile: %s : %s\n", pak->filename, temp);
+ stringlistappend(&resultlist, temp);
+ if (!quiet && developer_loading.integer)
+ Con_Printf("SearchPackFile: %s : %s\n", pak->filename, temp);
}
}
// strip off one path element at a time until empty
}
else
{
- // get a directory listing and look at each name
- dpsnprintf(netpath, sizeof (netpath), "%s%s", searchpath->filename, basepath);
- if ((dir = listdirectory(netpath)))
+ stringlist_t matchedSet, foundSet;
+ const char *start = pattern;
+
+ stringlistinit(&matchedSet);
+ stringlistinit(&foundSet);
+ // add a first entry to the set
+ stringlistappend(&matchedSet, "");
+ // iterate through pattern's path
+ while (*start)
{
- for (dirfile = dir;dirfile;dirfile = dirfile->next)
+ const char *asterisk, *wildcard, *nextseparator, *prevseparator;
+ char subpath[MAX_OSPATH];
+ char subpattern[MAX_OSPATH];
+
+ // find the next wildcard
+ wildcard = strchr(start, '?');
+ asterisk = strchr(start, '*');
+ if (asterisk && (!wildcard || asterisk < wildcard))
{
- dpsnprintf(temp, sizeof(temp), "%s%s", basepath, dirfile->text);
- if (matchpattern(temp, (char *)pattern, true))
+ wildcard = asterisk;
+ }
+
+ if (wildcard)
+ {
+ nextseparator = strchr( wildcard, '/' );
+ }
+ else
+ {
+ nextseparator = NULL;
+ }
+
+ if( !nextseparator ) {
+ nextseparator = start + strlen( start );
+ }
+
+ // prevseparator points past the '/' right before the wildcard and nextseparator at the one following it (or at the end of the string)
+ // copy everything up except nextseperator
+ strlcpy(subpattern, pattern, min(sizeof(subpattern), (size_t) (nextseparator - pattern + 1)));
+ // find the last '/' before the wildcard
+ prevseparator = strrchr( subpattern, '/' );
+ if (!prevseparator)
+ prevseparator = subpattern;
+ else
+ prevseparator++;
+ // copy everything from start to the previous including the '/' (before the wildcard)
+ // everything up to start is already included in the path of matchedSet's entries
+ strlcpy(subpath, start, min(sizeof(subpath), (size_t) ((prevseparator - subpattern) - (start - pattern) + 1)));
+
+ // for each entry in matchedSet try to open the subdirectories specified in subpath
+ for( dirlistindex = 0 ; dirlistindex < matchedSet.numstrings ; dirlistindex++ ) {
+ strlcpy( temp, matchedSet.strings[ dirlistindex ], sizeof(temp) );
+ strlcat( temp, subpath, sizeof(temp) );
+ listdirectory( &foundSet, searchpath->filename, temp );
+ }
+ if( dirlistindex == 0 ) {
+ break;
+ }
+ // reset the current result set
+ stringlistfreecontents( &matchedSet );
+ // match against the pattern
+ for( dirlistindex = 0 ; dirlistindex < foundSet.numstrings ; dirlistindex++ ) {
+ const char *direntry = foundSet.strings[ dirlistindex ];
+ if (matchpattern(direntry, subpattern, true)) {
+ stringlistappend( &matchedSet, direntry );
+ }
+ }
+ stringlistfreecontents( &foundSet );
+
+ start = nextseparator;
+ }
+
+ for (dirlistindex = 0;dirlistindex < matchedSet.numstrings;dirlistindex++)
+ {
+ const char *temp = matchedSet.strings[dirlistindex];
+ if (matchpattern(temp, (char *)pattern, true))
+ {
+ for (resultlistindex = 0;resultlistindex < resultlist.numstrings;resultlistindex++)
+ if (!strcmp(resultlist.strings[resultlistindex], temp))
+ break;
+ if (resultlistindex == resultlist.numstrings)
{
- for (listtemp = liststart;listtemp;listtemp = listtemp->next)
- if (!strcmp(listtemp->text, temp))
- break;
- if (listtemp == NULL)
- {
- listcurrent = stringlistappend(listcurrent, temp);
- if (liststart == NULL)
- liststart = listcurrent;
- if (!quiet)
- Con_DPrintf("SearchDirFile: %s\n", temp);
- }
+ stringlistappend(&resultlist, temp);
+ if (!quiet && developer_loading.integer)
+ Con_Printf("SearchDirFile: %s\n", temp);
}
}
- freedirectory(dir);
}
+ stringlistfreecontents( &matchedSet );
}
}
- if (liststart)
+ if (resultlist.numstrings)
{
- liststart = stringlistsort(liststart);
- numfiles = 0;
+ stringlistsort(&resultlist);
+ numfiles = resultlist.numstrings;
numchars = 0;
- for (listtemp = liststart;listtemp;listtemp = listtemp->next)
- {
- numfiles++;
- numchars += strlen(listtemp->text) + 1;
- }
- search = Z_Malloc(sizeof(fssearch_t) + numchars + numfiles * sizeof(char *));
+ for (resultlistindex = 0;resultlistindex < resultlist.numstrings;resultlistindex++)
+ numchars += (int)strlen(resultlist.strings[resultlistindex]) + 1;
+ search = (fssearch_t *)Z_Malloc(sizeof(fssearch_t) + numchars + numfiles * sizeof(char *));
search->filenames = (char **)((char *)search + sizeof(fssearch_t));
search->filenamesbuffer = (char *)((char *)search + sizeof(fssearch_t) + numfiles * sizeof(char *));
search->numfilenames = (int)numfiles;
numfiles = 0;
numchars = 0;
- for (listtemp = liststart;listtemp;listtemp = listtemp->next)
+ for (resultlistindex = 0;resultlistindex < resultlist.numstrings;resultlistindex++)
{
+ size_t textlen;
search->filenames[numfiles] = search->filenamesbuffer + numchars;
- strcpy(search->filenames[numfiles], listtemp->text);
+ textlen = strlen(resultlist.strings[resultlistindex]) + 1;
+ memcpy(search->filenames[numfiles], resultlist.strings[resultlistindex], textlen);
numfiles++;
- numchars += strlen(listtemp->text) + 1;
+ numchars += (int)textlen;
}
- if (liststart)
- stringlistfree(liststart);
}
+ stringlistfreecontents(&resultlist);
Mem_Free(basepath);
return search;
int linebufpos;
int i, j, k, l;
const char *name;
- char linebuf[4096];
+ char linebuf[MAX_INPUTLINE];
fssearch_t *search;
search = FS_Search(pattern, true, true);
if (!search)
columnwidth = 0;
for (i = 0;i < numfiles;i++)
{
- l = strlen(search->filenames[i]);
+ l = (int)strlen(search->filenames[i]);
if (columnwidth < l)
columnwidth = l;
}
FS_ListDirectoryCmd("ls", false);
}
+const char *FS_WhichPack(const char *filename)
+{
+ int index;
+ searchpath_t *sp = FS_FindFile(filename, &index, true);
+ if(sp && sp->pack)
+ return sp->pack->filename;
+ else
+ return 0;
+}
+
+/*
+====================
+FS_IsRegisteredQuakePack
+
+Look for a proof of purchase file file in the requested package
+
+If it is found, this file should NOT be downloaded.
+====================
+*/
+qboolean FS_IsRegisteredQuakePack(const char *name)
+{
+ searchpath_t *search;
+ pack_t *pak;
+
+ // search through the path, one element at a time
+ for (search = fs_searchpaths;search;search = search->next)
+ {
+ if (search->pack && !strcasecmp(FS_FileWithoutPath(search->filename), name))
+ {
+ int (*strcmp_funct) (const char* str1, const char* str2);
+ int left, right, middle;
+
+ pak = search->pack;
+ strcmp_funct = pak->ignorecase ? strcasecmp : strcmp;
+
+ // Look for the file (binary search)
+ left = 0;
+ right = pak->numfiles - 1;
+ while (left <= right)
+ {
+ int diff;
+
+ middle = (left + right) / 2;
+ diff = !strcmp_funct (pak->files[middle].name, "gfx/pop.lmp");
+
+ // Found it
+ if (!diff)
+ return true;
+
+ // If we're too far in the list
+ if (diff > 0)
+ right = middle - 1;
+ else
+ left = middle + 1;
+ }
+
+ // we found the requested pack but it is not registered quake
+ return false;
+ }
+ }
+
+ return false;
+}
+
+int FS_CRCFile(const char *filename, size_t *filesizepointer)
+{
+ int crc = -1;
+ unsigned char *filedata;
+ fs_offset_t filesize;
+ if (filesizepointer)
+ *filesizepointer = 0;
+ if (!filename || !*filename)
+ return crc;
+ filedata = FS_LoadFile(filename, tempmempool, true, &filesize);
+ if (filedata)
+ {
+ if (filesizepointer)
+ *filesizepointer = filesize;
+ crc = CRC_Block(filedata, filesize);
+ Mem_Free(filedata);
+ }
+ return crc;
+}
+
projects / xonotic / darkplaces.git / blobdiff