int ignorecase; // PK3 ignores case
int numfiles;
packfile_t *files;
- mempool_t *mempool;
struct pack_s *next;
} pack_t;
*/
mempool_t *fs_mempool;
-mempool_t *pak_mempool;
int fs_filesize;
return NULL;
if (! PK3_GetEndOfCentralDir (packfile, packhandle, &eocd))
- Sys_Error ("%s is not a PK3 file", packfile);
+ {
+ Con_Printf ("%s is not a PK3 file", packfile);
+ close(packhandle);
+ return NULL;
+ }
// Multi-volume ZIP archives are NOT allowed
if (eocd.disknum != 0 || eocd.cdir_disknum != 0)
- Sys_Error ("%s is a multi-volume ZIP archive", packfile);
+ {
+ Con_Printf ("%s is a multi-volume ZIP archive", packfile);
+ close(packhandle);
+ return NULL;
+ }
// We only need to do this test if MAX_FILES_IN_PACK is lesser than 65535
// since eocd.nbentries is an unsigned 16 bits integer
#if MAX_FILES_IN_PACK < 65535
if (eocd.nbentries > MAX_FILES_IN_PACK)
- Sys_Error ("%s contains too many files (%hu)", packfile, eocd.nbentries);
+ {
+ Con_Printf ("%s contains too many files (%hu)", packfile, eocd.nbentries);
+ close(packhandle);
+ return NULL;
+ }
#endif
// Create a package structure in memory
- pack = Mem_Alloc (pak_mempool, sizeof (pack_t));
+ pack = 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->mempool = Mem_AllocPool (packfile, 0, NULL);
- pack->files = Mem_Alloc (pack->mempool, eocd.nbentries * sizeof(packfile_t));
+ pack->files = Mem_Alloc(fs_mempool, eocd.nbentries * sizeof(packfile_t));
pack->next = packlist;
packlist = pack;
real_nb_files = PK3_BuildFileList (pack, &eocd);
if (real_nb_files < 0)
- Sys_Error ("%s is not a valid PK3 file", packfile);
+ {
+ Con_Printf ("%s is not a valid PK3 file", packfile);
+ close(pack->handle);
+ Mem_Free(pack);
+ return NULL;
+ }
Con_Printf("Added packfile %s (%i files)\n", packfile, real_nb_files);
return pack;
Find where the true file data offset is
====================
*/
-void PK3_GetTrueFileOffset (packfile_t *pfile, pack_t *pack)
+qboolean PK3_GetTrueFileOffset (packfile_t *pfile, pack_t *pack)
{
qbyte buffer [ZIP_LOCAL_CHUNK_BASE_SIZE];
size_t count;
// Already found?
if (pfile->flags & PACKFILE_FLAG_TRUEOFFS)
- return;
+ return true;
// Load the local file description
lseek (pack->handle, pfile->offset, SEEK_SET);
count = read (pack->handle, buffer, ZIP_LOCAL_CHUNK_BASE_SIZE);
if (count != ZIP_LOCAL_CHUNK_BASE_SIZE || BuffBigLong (buffer) != ZIP_DATA_HEADER)
- Sys_Error ("Can't retrieve file %s in package %s", pfile->name, pack->filename);
+ {
+ Con_Printf ("Can't retrieve file %s in package %s", pfile->name, pack->filename);
+ return false;
+ }
// Skip name and extra field
pfile->offset += BuffLittleShort (&buffer[26]) + BuffLittleShort (&buffer[28]) + ZIP_LOCAL_CHUNK_BASE_SIZE;
pfile->flags |= PACKFILE_FLAG_TRUEOFFS;
+ return true;
}
// If we found the file, there's a problem
if (!diff)
- Sys_Error ("Package %s contains the file %s several times\n",
- pack->filename, name);
+ Con_Printf ("Package %s contains the file %s several times\n", pack->filename, name);
// If we're too far in the list
if (diff > 0)
for (s=fs_searchpaths ; s ; s=s->next)
{
if (s->pack)
- {
Con_Printf("%s (%i files)\n", s->pack->filename, s->pack->numfiles);
- }
else
Con_Printf("%s\n", s->filename);
}
return NULL;
read (packhandle, (void *)&header, sizeof(header));
if (memcmp(header.id, "PACK", 4))
- Sys_Error ("%s is not a packfile", packfile);
+ {
+ Con_Printf ("%s is not a packfile", packfile);
+ close(packhandle);
+ return NULL;
+ }
header.dirofs = LittleLong (header.dirofs);
header.dirlen = LittleLong (header.dirlen);
if (header.dirlen % sizeof(dpackfile_t))
- Sys_Error ("%s has an invalid directory size", packfile);
+ {
+ Con_Printf ("%s has an invalid directory size", packfile);
+ close(packhandle);
+ return NULL;
+ }
numpackfiles = header.dirlen / sizeof(dpackfile_t);
if (numpackfiles > MAX_FILES_IN_PACK)
- Sys_Error ("%s has %i files", packfile, numpackfiles);
+ {
+ Con_Printf ("%s has %i files", packfile, numpackfiles);
+ close(packhandle);
+ return NULL;
+ }
- pack = Mem_Alloc(pak_mempool, sizeof (pack_t));
+ pack = 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->mempool = Mem_AllocPool(packfile, 0, NULL);
- pack->files = Mem_Alloc(pack->mempool, numpackfiles * sizeof(packfile_t));
+ pack->files = Mem_Alloc(fs_mempool, numpackfiles * sizeof(packfile_t));
pack->next = packlist;
packlist = pack;
{
if (matchpattern(current->text, "*.pak", true))
{
- dpsnprintf (pakfile, sizeof (pakfile), "%s/%s", dir, current->text);
+ dpsnprintf (pakfile, sizeof (pakfile), "%s%s", dir, current->text);
pak = FS_LoadPackPAK (pakfile);
if (pak)
{
- search = Mem_Alloc(pak_mempool, sizeof(searchpath_t));
+ search = Mem_Alloc(fs_mempool, sizeof(searchpath_t));
search->pack = pak;
search->next = fs_searchpaths;
fs_searchpaths = search;
{
if (matchpattern(current->text, "*.pk3", true))
{
- dpsnprintf (pakfile, sizeof (pakfile), "%s/%s", dir, current->text);
+ dpsnprintf (pakfile, sizeof (pakfile), "%s%s", dir, current->text);
pak = FS_LoadPackPK3 (pakfile);
if (pak)
{
- search = Mem_Alloc(pak_mempool, sizeof(searchpath_t));
+ search = Mem_Alloc(fs_mempool, sizeof(searchpath_t));
search->pack = pak;
search->next = fs_searchpaths;
fs_searchpaths = search;
// Add the directory to the search path
// (unpacked files have the priority over packed files)
- search = Mem_Alloc(pak_mempool, sizeof(searchpath_t));
+ search = 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
const char *homedir;
-
- strlcpy (com_modname, dir, sizeof (com_modname));
+#endif
// Add the common game directory
- FS_AddGameDirectory (va("%s/%s", fs_basedir, dir));
+ FS_AddGameDirectory (va("%s/%s/", fs_basedir, dir));
+#ifndef WIN32
// Add the personal game directory
homedir = getenv ("HOME");
if (homedir != NULL && homedir[0] != '\0')
- FS_AddGameDirectory (va("%s/.%s/%s", homedir, gameuserdirname, dir));
+ FS_AddGameDirectory (va("%s/.%s/%s/", homedir, gameuserdirname, dir));
+#endif
}
searchpath_t *search;
fs_mempool = Mem_AllocPool("file management", 0, NULL);
- pak_mempool = Mem_AllocPool("paks", 0, NULL);
-
- Cvar_RegisterVariable (&scr_screenshot_name);
-
- Cmd_AddCommand ("path", FS_Path_f);
- Cmd_AddCommand ("dir", FS_Dir_f);
- Cmd_AddCommand ("ls", FS_Ls_f);
strcpy(fs_basedir, ".");
- strcpy(fs_gamedir, ".");
+ strcpy(fs_gamedir, "");
+
+#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
PK3_OpenLibrary ();
if (!com_argv[i] || com_argv[i][0] == '+' || com_argv[i][0] == '-')
break;
- search = Mem_Alloc(pak_mempool, sizeof(searchpath_t));
+ 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)
- Sys_Error ("Couldn't load packfile: %s", com_argv[i]);
+ {
+ 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)
- Sys_Error ("Couldn't load packfile: %s", com_argv[i]);
+ {
+ Con_Printf ("Couldn't load packfile: %s", com_argv[i]);
+ Mem_Free(search);
+ continue;
+ }
}
else
strlcpy (search->filename, com_argv[i], sizeof (search->filename));
// add the game-specific paths
// gamedirname1 (typically id1)
FS_AddGameHierarchy (gamedirname1);
- Cvar_SetQuick (&scr_screenshot_name, gamescreenshotname);
// add the game-specific path, if any
if (gamedirname2)
FS_AddGameHierarchy (gamedirname2);
}
+ // set the com_modname (reported in server info)
+ strlcpy(com_modname, gamedirname1, sizeof(com_modname));
+
// -game <gamedir>
// Adds basedir/gamedir as an override game
// LordHavoc: now supports multiple -game directories
i++;
fs_modified = true;
FS_AddGameHierarchy (com_argv[i]);
- Cvar_SetQuick (&scr_screenshot_name, com_modname);
+ // update the com_modname
+ strlcpy (com_modname, com_argv[i], sizeof (com_modname));
}
}
unlink (va("%s/qconsole.log", fs_gamedir));
}
+void FS_Init_Commands(void)
+{
+ Cvar_RegisterVariable (&scr_screenshot_name);
+
+ 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);
+}
+
/*
================
FS_Shutdown
*/
void FS_Shutdown (void)
{
- Mem_FreePool (&pak_mempool);
Mem_FreePool (&fs_mempool);
}
pfile = &pack->files[pack_ind];
+ fs_filesize = -1;
+
// If we don't have the true offset, get it now
if (! (pfile->flags & PACKFILE_FLAG_TRUEOFFS))
- PK3_GetTrueFileOffset (pfile, pack);
+ if (!PK3_GetTrueFileOffset (pfile, pack))
+ return NULL;
// No Zlib DLL = no compressed files
if (!zlib_dll && (pfile->flags & PACKFILE_FLAG_DEFLATED))
Con_Printf("WARNING: can't open the compressed file %s\n"
"You need the Zlib DLL to use compressed files\n",
pfile->name);
- fs_filesize = -1;
+ return NULL;
+ }
+
+ // LordHavoc: lseek affects all duplicates of a handle so we do it before
+ // 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);
return NULL;
}
dup_handle = dup (pack->handle);
if (dup_handle < 0)
- Sys_Error ("FS_OpenPackedFile: can't dup package's handle (pack: %s)", pack->filename);
+ {
+ Con_Printf ("FS_OpenPackedFile: can't dup package's handle (pack: %s)", pack->filename);
+ return NULL;
+ }
file = Mem_Alloc (fs_mempool, sizeof (*file));
memset (file, 0, sizeof (*file));
file->position = 0;
file->ungetc = EOF;
- if (lseek (file->handle, file->offset, SEEK_SET) == -1)
- Sys_Error ("FS_OpenPackedFile: can't lseek to %s in %s (offset: %d)",
- pfile->name, pack->filename, file->offset);
-
if (pfile->flags & PACKFILE_FLAG_DEFLATED)
{
ztoolkit_t *ztk;
* size of both compressed and uncompressed data
*/
if (qz_inflateInit2 (&ztk->zstream, -MAX_WBITS) != Z_OK)
- Sys_Error ("FS_OpenPackedFile: inflate init error (file: %s)", pfile->name);
+ {
+ Con_Printf ("FS_OpenPackedFile: inflate init error (file: %s)", pfile->name);
+ close(dup_handle);
+ Mem_Free(file);
+ return NULL;
+ }
ztk->zstream.next_out = file->buff;
ztk->zstream.avail_out = sizeof (file->buff);
else
{
char netpath[MAX_OSPATH];
- dpsnprintf(netpath, sizeof(netpath), "%s/%s", search->filename, name);
+ dpsnprintf(netpath, sizeof(netpath), "%s%s", search->filename, name);
if (FS_SysFileExists (netpath))
{
if (!quiet)
if (pack_ind < 0)
{
char path [MAX_OSPATH];
- dpsnprintf (path, sizeof (path), "%s/%s", search->filename, filename);
+ dpsnprintf (path, sizeof (path), "%s%s", search->filename, filename);
return FS_SysOpen (path, "rb", nonblocking);
}
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);
count = sizeof (ztk->input);
lseek (file->handle, file->offset + ztk->in_position, SEEK_SET);
if (read (file->handle, ztk->input, count) != (ssize_t)count)
- Sys_Error ("FS_Read: unexpected end of file");
+ {
+ Con_Printf ("FS_Read: unexpected end of file");
+ break;
+ }
ztk->in_ind = 0;
ztk->in_len = count;
ztk->zstream.avail_out = sizeof (file->buff);
error = qz_inflate (&ztk->zstream, Z_SYNC_FLUSH);
if (error != Z_OK && error != Z_STREAM_END)
- Sys_Error ("Can't inflate file");
+ {
+ Con_Printf ("FS_Read: Can't inflate file");
+ break;
+ }
ztk->in_ind = ztk->in_len - ztk->zstream.avail_in;
file->buff_len = sizeof (file->buff) - ztk->zstream.avail_out;
ztk->zstream.avail_out = buffersize;
error = qz_inflate (&ztk->zstream, Z_SYNC_FLUSH);
if (error != Z_OK && error != Z_STREAM_END)
- Sys_Error ("Can't inflate file");
+ {
+ Con_Printf ("FS_Read: Can't inflate file");
+ break;
+ }
ztk->in_ind = ztk->in_len - ztk->zstream.avail_in;
// How much data did it inflate?
char netpath[MAX_OSPATH];
char temp[MAX_OSPATH];
- while(!strncmp(pattern, "./", 2))
- pattern += 2;
- while(!strncmp(pattern, ".\\", 2))
- pattern += 2;
+ for (i = 0;pattern[i] == '.' || pattern[i] == ':' || pattern[i] == '/' || pattern[i] == '\\';i++)
+ ;
+
+ if (i > 0)
+ {
+ Con_Printf("Don't use punctuation at the beginning of a search pattern!\n");
+ return NULL;
+ }
search = NULL;
liststart = NULL;
slash = strrchr(pattern, '/');
backslash = strrchr(pattern, '\\');
colon = strrchr(pattern, ':');
- separator = pattern;
- if (separator < slash)
- separator = slash;
- if (separator < backslash)
- separator = backslash;
- if (separator < colon)
- separator = colon;
- basepathlength = separator - pattern;
+ separator = max(slash, backslash);
+ separator = max(separator, colon);
+ basepathlength = separator ? (separator + 1 - pattern) : 0;
basepath = Mem_Alloc (tempmempool, basepathlength + 1);
if (basepathlength)
memcpy(basepath, pattern, basepathlength);
else
{
// get a directory listing and look at each name
- dpsnprintf(netpath, sizeof (netpath), "%s/%s", searchpath->filename, basepath);
+ dpsnprintf(netpath, sizeof (netpath), "%s%s", searchpath->filename, basepath);
if ((dir = listdirectory(netpath)))
{
for (dirfile = dir;dirfile;dirfile = dirfile->next)
{
- dpsnprintf(temp, sizeof(temp), "%s/%s", basepath, dirfile->text);
+ dpsnprintf(temp, sizeof(temp), "%s%s", basepath, dirfile->text);
if (matchpattern(temp, (char *)pattern, true))
{
for (listtemp = liststart;listtemp;listtemp = listtemp->next)