/*
DarkPlaces file system
- Copyright (C) 2003-2005 Mathieu Olivier
+ 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
void FS_Dir_f(void);
void FS_Ls_f(void);
+static const char *FS_FileExtension (const char *in);
+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, int flags);
mempool_t *fs_mempool;
-fs_offset_t fs_filesize;
-
pack_t *packlist = NULL;
searchpath_t *fs_searchpaths = NULL;
qboolean fs_modified; // set true if using non-id files
-cvar_t scr_screenshot_name = {0, "scr_screenshot_name","dp"};
+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)"};
/*
*/
qboolean PK3_GetEndOfCentralDir (const char *packfile, int packhandle, pk3_endOfCentralDir_t *eocd)
{
- long filesize, maxsize;
+ fs_offset_t filesize, maxsize;
unsigned char *buffer, *ptr;
int ind;
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;
}
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;
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;
}
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;
+ }
+
+ 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->next = packlist;
packlist = pack;
- info = (dpackfile_t *)Mem_Alloc(tempmempool, sizeof(*info) * numpackfiles);
- lseek (packhandle, header.dirofs, SEEK_SET);
- read (packhandle, (void *)info, header.dirlen);
-
// 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);
+}
+
/*
================
{
stringlist_t *list, *current;
searchpath_t *search;
- pack_t *pak;
char pakfile[MAX_OSPATH];
strlcpy (fs_gamedir, dir, sizeof (fs_gamedir));
// add any PAK package in the directory
for (current = list;current;current = current->next)
{
- if (matchpattern(current->text, "*.pak", true))
+ if (!strcasecmp(FS_FileExtension(current->text), "pak"))
{
dpsnprintf (pakfile, sizeof (pakfile), "%s%s", dir, current->text);
- pak = FS_LoadPackPAK (pakfile);
- if (pak)
- {
- search = (searchpath_t *)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(pakfile, NULL, false);
}
}
// add any PK3 package in the director
for (current = list;current;current = current->next)
{
- if (matchpattern(current->text, "*.pk3", true))
+ if (!strcasecmp(FS_FileExtension(current->text), "pk3"))
{
dpsnprintf (pakfile, sizeof (pakfile), "%s%s", dir, current->text);
- pak = FS_LoadPackPK3 (pakfile);
- if (pak)
- {
- search = (searchpath_t *)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(pakfile, NULL, false);
}
}
freedirectory(list);
#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
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_mempool = Mem_AllocPool("file management", 0, NULL);
- strcpy(fs_basedir, ".");
strcpy(fs_gamedir, "");
+// If the base directory is explicitly defined by the compilation process
+#ifdef DP_FS_BASEDIR
+ strcpy(fs_basedir, DP_FS_BASEDIR);
+#else
+ strcpy(fs_basedir, "");
+
#ifdef MACOSX
// FIXME: is there a better way to find the directory outside the .app?
if (strstr(com_argv[0], ".app/"))
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;
}
+ // 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));
+
// -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)
if (!com_argv[i] || com_argv[i][0] == '+' || com_argv[i][0] == '-')
break;
- search = (searchpath_t *)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"))
+ if(!FS_AddPack_Fullpath(com_argv[i], NULL, false))
{
- 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
+ search = (searchpath_t *)Mem_Alloc(fs_mempool, sizeof(searchpath_t));
strlcpy (search->filename, com_argv[i], sizeof (search->filename));
- search->next = fs_searchpaths;
- fs_searchpaths = search;
+ search->next = fs_searchpaths;
+ fs_searchpaths = search;
+ }
}
return;
}
{
Cvar_RegisterVariable (&scr_screenshot_name);
- Cmd_AddCommand ("path", FS_Path_f);
- Cmd_AddCommand ("dir", FS_Dir_f);
- Cmd_AddCommand ("ls", FS_Ls_f);
+ 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");
// set the default screenshot name to either the mod name or the
// gamemode screenshot name
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)",
+ Con_Printf ("FS_OpenPackedFile: can't lseek to %s in %s (offset: %d)\n",
pfile->name, pack->filename, 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;
}
*/
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;
}
// Found it
if (!diff)
{
- if (!quiet)
- Con_DPrintf("FS_FindFile: %s in %s\n",
+ 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))
{
Con_Printf("FS_Open(\"%s\", \"%s\", %s): nasty filename rejected\n", filepath, mode, quiet ? "true" : "false");
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);
}
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;
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;
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 = (char *)Mem_Alloc (tempmempool, buff_size);
- len = dpvsnprintf (tempbuff, buff_size, format, ap);
- while (len < 0)
+ for (;;)
{
- Mem_Free (tempbuff);
- buff_size *= 2;
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;
}
len = write (file->handle, tempbuff, len);
Always appends a 0 byte.
============
*/
-unsigned char *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;
- unsigned char *buf;
+ unsigned char *buf = NULL;
+ fs_offset_t filesize = 0;
file = FS_Open (path, "rb", quiet, false);
- if (!file)
- return NULL;
-
- buf = (unsigned char *)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 (filesizepointer)
+ *filesizepointer = filesize;
return buf;
}
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)
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;
+}