pack_t *packlist = NULL;
-searchpath_t *fs_searchpaths;
+searchpath_t *fs_searchpaths = NULL;
#define MAX_FILES_IN_PACK 65536
*/
void PK3_CloseLibrary (void)
{
- if (!zlib_dll)
- return;
-
- Sys_UnloadLibrary (zlib_dll);
- zlib_dll = NULL;
+ Sys_UnloadLibrary (&zlib_dll);
}
qboolean PK3_OpenLibrary (void)
{
const char* dllname;
- const dllfunction_t *func;
// Already loaded?
if (zlib_dll)
dllname = "libz.so";
#endif
- // Initializations
- for (func = zlibfuncs; func && func->name != NULL; func++)
- *func->funcvariable = NULL;
-
// Load the DLL
- if (! (zlib_dll = Sys_LoadLibrary (dllname)))
+ if (! Sys_LoadLibrary (dllname, &zlib_dll, zlibfuncs))
{
- Con_Printf("Can't find %s. Compressed files support disabled\n", dllname);
+ Con_Printf ("Compressed files support disabled\n");
return false;
}
- // Get the function adresses
- for (func = zlibfuncs; func && func->name != NULL; func++)
- if (!(*func->funcvariable = (void *) Sys_GetProcAddress (zlib_dll, func->name)))
- {
- Con_Printf("missing function \"%s\" - broken Zlib library!\n", func->name);
- PK3_CloseLibrary ();
- return false;
- }
-
- Con_Printf("%s loaded. Compressed files support enabled\n", dllname);
+ Con_Printf ("Compressed files support enabled\n");
return true;
}
if (real_nb_files <= 0)
Sys_Error ("%s is not a valid PK3 file", packfile);
- Con_Printf ("Added packfile %s (%i files)\n", packfile, real_nb_files);
+ Con_Printf("Added packfile %s (%i files)\n", packfile, real_nb_files);
return pack;
}
{
searchpath_t *s;
- Con_Printf ("Current search path:\n");
+ Con_Print("Current search path:\n");
for (s=fs_searchpaths ; s ; s=s->next)
{
if (s->pack)
{
- Con_Printf ("%s (%i files)\n", s->pack->filename, s->pack->numfiles);
+ Con_Printf("%s (%i files)\n", s->pack->filename, s->pack->numfiles);
}
else
- Con_Printf ("%s\n", s->filename);
+ Con_Printf("%s\n", s->filename);
}
}
Mem_Free(info);
- Con_Printf ("Added packfile %s (%i files)\n", packfile, numpackfiles);
+ Con_Printf("Added packfile %s (%i files)\n", packfile, numpackfiles);
return pack;
}
separator = backslash;
if (separator < colon)
separator = colon;
- if (dot < separator)
+ if (dot == NULL || dot < separator)
return "";
dot++;
for (i = 0;i < 7 && dot[i];i++)
Cmd_AddCommand ("ls", FS_Ls_f);
strcpy(fs_basedir, ".");
+ strcpy(fs_gamedir, ".");
PK3_OpenLibrary ();
// Overrides the system supplied base directory (under GAMENAME)
i = COM_CheckParm ("-basedir");
if (i && i < com_argc-1)
- strlcpy (fs_basedir, com_argv[i+1], sizeof (fs_basedir));
-
- i = strlen (fs_basedir);
- if (i > 0 && (fs_basedir[i-1] == '\\' || fs_basedir[i-1] == '/'))
- fs_basedir[i-1] = 0;
-
- // start up with GAMENAME by default (id1)
- strlcpy (com_modname, GAMENAME, sizeof (com_modname));
- FS_AddGameDirectory (va("%s/"GAMENAME, fs_basedir));
- if (gamedirname[0])
{
- fs_modified = true;
- strlcpy (com_modname, gamedirname, sizeof (com_modname));
- FS_AddGameDirectory (va("%s/%s", fs_basedir, gamedirname));
- }
-
- // -game <gamedir>
- // Adds basedir/gamedir as an override game
- i = COM_CheckParm ("-game");
- if (i && i < com_argc-1)
- {
- fs_modified = true;
- strlcpy (com_modname, com_argv[i+1], sizeof (com_modname));
- FS_AddGameDirectory (va("%s/%s", fs_basedir, com_argv[i+1]));
+ strlcpy (fs_basedir, com_argv[i+1], sizeof (fs_basedir));
+ i = strlen (fs_basedir);
+ if (i > 0 && (fs_basedir[i-1] == '\\' || fs_basedir[i-1] == '/'))
+ fs_basedir[i-1] = 0;
}
// -path <dir or packfile> [<dir or packfile>] ...
if (i)
{
fs_modified = true;
- fs_searchpaths = NULL;
while (++i < com_argc)
{
if (!com_argv[i] || com_argv[i][0] == '+' || com_argv[i][0] == '-')
search->next = fs_searchpaths;
fs_searchpaths = search;
}
+ return;
+ }
+
+ // start up with GAMENAME by default (id1)
+ strlcpy (com_modname, GAMENAME, sizeof (com_modname));
+ FS_AddGameDirectory (va("%s/"GAMENAME, fs_basedir));
+
+ // add the game-specific path, if any
+ if (gamedirname[0])
+ {
+ fs_modified = true;
+ strlcpy (com_modname, gamedirname, sizeof (com_modname));
+ FS_AddGameDirectory (va("%s/%s", fs_basedir, gamedirname));
+ }
+
+ // -game <gamedir>
+ // Adds basedir/gamedir as an override game
+ i = COM_CheckParm ("-game");
+ if (i && i < com_argc-1)
+ {
+ fs_modified = true;
+ strlcpy (com_modname, com_argv[i+1], sizeof (com_modname));
+ FS_AddGameDirectory (va("%s/%s", fs_basedir, com_argv[i+1]));
}
}
if (!diff)
{
if (!quiet)
- Sys_Printf ("FS_FindFile: %s in %s\n",
+ Sys_Printf("FS_FindFile: %s in %s\n",
pak->files[middle].name, pak->filename);
if (index != NULL)
if (FS_SysFileExists (netpath))
{
if (!quiet)
- Sys_Printf ("FS_FindFile: %s\n", netpath);
+ Sys_Printf("FS_FindFile: %s\n", netpath);
if (index != NULL)
*index = -1;
}
if (!quiet)
- Sys_Printf ("FS_FindFile: can't find %s\n", name);
+ Sys_Printf("FS_FindFile: can't find %s\n", name);
if (index != NULL)
*index = -1;
// No Zlib DLL = no compressed files
if (!zlib_dll && (packfile->flags & FILE_FLAG_DEFLATED))
{
- Con_Printf ("WARNING: can't open the compressed file %s\n"
+ Con_Printf("WARNING: can't open the compressed file %s\n"
"You need the Zlib DLL to use compressed files\n",
filename);
fs_filesize = -1;
}
+/*
+====================
+FS_Print
+
+Print a string into a file
+====================
+*/
+int FS_Print(qfile_t* file, const char *msg)
+{
+ return FS_Write(file, msg, strlen(msg));
+}
+
/*
====================
FS_Printf
Print a string into a file
====================
*/
-int FS_Printf (qfile_t* file, const char* format, ...)
+int FS_Printf(qfile_t* file, const char* format, ...)
{
int result;
va_list args;
}
+/*
+====================
+FS_VPrintf
+
+Print a string into a file
+====================
+*/
+int FS_VPrintf(qfile_t* file, const char* format, va_list ap)
+{
+ return vfprintf (file->stream, format, ap);
+}
+
+
/*
====================
FS_Getc
Always appends a 0 byte.
============
*/
-qbyte *FS_LoadFile (const char *path, qboolean quiet)
+qbyte *FS_LoadFile (const char *path, mempool_t *pool, qboolean quiet)
{
qfile_t *h;
qbyte *buf;
if (!h)
return NULL;
- buf = Mem_Alloc(tempmempool, fs_filesize+1);
+ buf = Mem_Alloc(pool, fs_filesize+1);
if (!buf)
Sys_Error ("FS_LoadFile: not enough available memory for %s (size %i)", path, fs_filesize);
handle = FS_Open (filename, "wb", false);
if (!handle)
{
- Con_Printf ("FS_WriteFile: failed on %s\n", filename);
+ Con_Printf("FS_WriteFile: failed on %s\n", filename);
return false;
}
- Con_DPrintf ("FS_WriteFile: %s\n", filename);
+ Con_DPrintf("FS_WriteFile: %s\n", filename);
FS_Write (handle, data, len);
FS_Close (handle);
return true;
if (separator < colon)
separator = colon;
basepathlength = separator - pattern;
- basepath = Z_Malloc(basepathlength + 1);
+ basepath = Mem_Alloc (tempmempool, basepathlength + 1);
if (basepathlength)
memcpy(basepath, pattern, basepathlength);
basepath[basepathlength] = 0;
stringlistfree(liststart);
}
- Z_Free(basepath);
+ Mem_Free(basepath);
return search;
}
const char *name;
char linebuf[4096];
fssearch_t *search;
- search = FS_Search(pattern, true, false);
+ search = FS_Search(pattern, true, true);
if (!search)
return 0;
numfiles = search->numfilenames;
static void FS_ListDirectoryCmd (const char* cmdname, int oneperline)
{
- char pattern[MAX_OSPATH];
+ const char *pattern;
if (Cmd_Argc() > 3)
{
Con_Printf("usage:\n%s [path/pattern]\n", cmdname);
return;
}
if (Cmd_Argc() == 2)
- snprintf(pattern, sizeof(pattern), "%s", Cmd_Argv(1));
+ pattern = Cmd_Argv(1);
else
- strcpy(pattern, "*");
+ pattern = "*";
if (!FS_ListDirectory(pattern, oneperline))
- Con_Printf("No files found.\n");
+ Con_Print("No files found.\n");
}
void FS_Dir_f(void)
projects / xonotic / darkplaces.git / blobdiff