/*
- Quake file system
+ DarkPlaces file system
Copyright (C) 2003 Mathieu Olivier
Copyright (C) 1999,2000 contributors of the QuakeForge project
#include "fs.h"
+
/*
All of Quake's data access is through a hierchal file system, but the contents
#define ZIP_CDIR_CHUNK_BASE_SIZE 46
#define ZIP_LOCAL_CHUNK_BASE_SIZE 30
+// Zlib constants (from zlib.h)
+#define Z_SYNC_FLUSH 2
+#define MAX_WBITS 15
+#define Z_OK 0
+#define Z_STREAM_END 1
+#define ZLIB_VERSION "1.1.4"
+
/*
=============================================================================
=============================================================================
*/
+// Zlib stream (from zlib.h)
+// Warning: some pointers we don't use directly have
+// been cast to "void*" for a matter of simplicity
+typedef struct
+{
+ qbyte *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 int avail_out; // remaining free space at next_out
+ unsigned long total_out; // total nb of bytes output so far
+
+ char *msg; // last error message, NULL if no error
+ void *state; // not visible by applications
+
+ void *zalloc; // used to allocate the internal state
+ void *zfree; // used to free the internal state
+ void *opaque; // private data object passed to zalloc and zfree
+
+ int data_type; // best guess about the data type: ascii or binary
+ unsigned long adler; // adler32 value of the uncompressed data
+ unsigned long reserved; // reserved for future use
+} z_stream;
+
+
// Our own file structure on top of FILE
typedef enum
{
FS_FLAG_NONE = 0,
- FS_FLAG_PACKED = (1 << 0) // inside a package (PAK or PK3)
+ FS_FLAG_PACKED = (1 << 0), // inside a package (PAK or PK3)
+ FS_FLAG_DEFLATED = (1 << 1) // file is compressed using the deflate algorithm (PK3 only)
} fs_flags_t;
+#define ZBUFF_SIZE 1024
+typedef struct
+{
+ z_stream zstream;
+ size_t real_length; // length of the uncompressed file
+ size_t in_ind, in_max; // input buffer index and counter
+ size_t in_position; // position in the compressed file
+ size_t out_ind, out_max; // output buffer index and counter
+ size_t out_position; // how many bytes did we uncompress until now?
+ qbyte input [ZBUFF_SIZE];
+ qbyte output [ZBUFF_SIZE];
+} ztoolkit_t;
+
struct qfile_s
{
fs_flags_t flags;
FILE* stream;
- size_t length; // file size (PACKED only)
+ size_t length; // file size on disk (PACKED only)
size_t offset; // offset into a package (PACKED only)
size_t position; // current position in the file (PACKED only)
+ ztoolkit_t* z; // used for inflating (DEFLATED only)
};
// Packages in memory
-typedef enum
+typedef enum
{
FILE_FLAG_NONE = 0,
FILE_FLAG_TRUEOFFS = (1 << 0), // the offset in packfile_t is the true contents offset
{
char filename [MAX_OSPATH];
FILE *handle;
+ int ignorecase; // PK3 ignores case
int numfiles;
packfile_t *files;
mempool_t *mempool;
searchpath_t *fs_searchpaths;
-// LordHavoc: was 2048, increased to 65536 and changed info[MAX_PACK_FILES] to a temporary alloc
-#define MAX_FILES_IN_PACK 65536
+#define MAX_FILES_IN_PACK 65536
char fs_gamedir[MAX_OSPATH];
char fs_basedir[MAX_OSPATH];
=============================================================================
*/
+// Functions exported from zlib
+#ifdef WIN32
+# define ZEXPORT WINAPI
+#else
+# define ZEXPORT
+#endif
+
+static int (ZEXPORT *qz_inflate) (z_stream* strm, int flush);
+static int (ZEXPORT *qz_inflateEnd) (z_stream* strm);
+static int (ZEXPORT *qz_inflateInit2_) (z_stream* strm, int windowBits, const char *version, int stream_size);
+static int (ZEXPORT *qz_inflateReset) (z_stream* strm);
+
+#define qz_inflateInit2(strm, windowBits) \
+ qz_inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
+
+static dllfunction_t zlibfuncs[] =
+{
+ {"inflate", (void **) &qz_inflate},
+ {"inflateEnd", (void **) &qz_inflateEnd},
+ {"inflateInit2_", (void **) &qz_inflateInit2_},
+ {"inflateReset", (void **) &qz_inflateReset},
+ {NULL, NULL}
+};
+
+// Handle for Zlib DLL
+static dllhandle_t zlib_dll = NULL;
+
+
+/*
+====================
+PK3_CloseLibrary
+
+Unload the Zlib DLL
+====================
+*/
+void PK3_CloseLibrary (void)
+{
+ if (!zlib_dll)
+ return;
+
+ Sys_UnloadLibrary (zlib_dll);
+ zlib_dll = NULL;
+}
+
+
+/*
+====================
+PK3_OpenLibrary
+
+Try to load the Zlib DLL
+====================
+*/
+qboolean PK3_OpenLibrary (void)
+{
+ const char* dllname;
+ const dllfunction_t *func;
+
+ // Already loaded?
+ if (zlib_dll)
+ return true;
+
+#ifdef WIN32
+ dllname = "zlib.dll";
+#else
+ 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)))
+ {
+ Con_Printf("Can't find %s. Compressed files support disabled\n", dllname);
+ 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);
+ return true;
+}
+
+
/*
====================
PK3_GetEndOfCentralDir
maxsize = ZIP_MAX_COMMENTS_SIZE + ZIP_END_CDIR_SIZE;
buffer = Mem_Alloc (tempmempool, maxsize);
fseek (packhandle, filesize - maxsize, SEEK_SET);
- if (fread (buffer, 1, maxsize, packhandle) != maxsize)
+ if (fread (buffer, 1, maxsize, packhandle) != (unsigned long) maxsize)
{
Mem_Free (buffer);
return false;
if ((ptr[8] & 0x29) == 0 && (ptr[38] & 0x18) == 0)
{
// Still enough bytes for the name?
- if (remaining < namesize || namesize >= sizeof (*pack->files))
+ if ((size_t) remaining < namesize || namesize >= sizeof (*pack->files))
{
Mem_Free (central_dir);
return -1;
if (eocd.disknum != 0 || eocd.cdir_disknum != 0)
Sys_Error ("%s is a multi-volume ZIP archive", packfile);
+ // 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);
+ #endif
// Create a package structure in memory
pack = Mem_Alloc (pak_mempool, sizeof (pack_t));
- strcpy (pack->filename, packfile);
+ 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);
Sys_Error ("%s has %i files", packfile, numpackfiles);
pack = Mem_Alloc(pak_mempool, sizeof (pack_t));
- strcpy (pack->filename, packfile);
+ pack->ignorecase = false; // PAK is case sensitive
+ strlcpy (pack->filename, packfile, sizeof (pack->filename));
pack->handle = packhandle;
pack->numfiles = numpackfiles;
pack->mempool = Mem_AllocPool(packfile);
size_t size;
packfile_t *file = &pack->files[i];
- strcpy (file->name, info[i].name);
+ strlcpy (file->name, info[i].name, sizeof (file->name));
file->offset = LittleLong(info[i].filepos);
size = LittleLong (info[i].filelen);
file->packsize = size;
pack_t *pak;
char pakfile[MAX_OSPATH];
- strcpy (fs_gamedir, dir);
+ strlcpy (fs_gamedir, dir, sizeof (fs_gamedir));
// add the directory to the search path
search = Mem_Alloc(pak_mempool, sizeof(searchpath_t));
- strcpy (search->filename, dir);
+ strlcpy (search->filename, dir, sizeof (search->filename));
search->next = fs_searchpaths;
fs_searchpaths = search;
{
if (matchpattern(current->text, "*.pak", true))
{
- sprintf (pakfile, "%s/%s", dir, current->text);
+ snprintf (pakfile, sizeof (pakfile), "%s/%s", dir, current->text);
pak = FS_LoadPackPAK (pakfile);
if (pak)
{
{
if (matchpattern(current->text, "*.pk3", true))
{
- sprintf (pakfile, "%s/%s", dir, current->text);
+ snprintf (pakfile, sizeof (pakfile), "%s/%s", dir, current->text);
pak = FS_LoadPackPK3 (pakfile);
if (pak)
{
char *FS_FileExtension (const char *in)
{
static char exten[8];
+ const char *slash, *backslash, *colon, *dot, *separator;
int i;
- while (*in && *in != '.')
- in++;
- if (!*in)
+ slash = strrchr(in, '/');
+ backslash = strrchr(in, '\\');
+ colon = strrchr(in, ':');
+ dot = strrchr(in, '.');
+ separator = slash;
+ if (separator < backslash)
+ separator = backslash;
+ if (separator < colon)
+ separator = colon;
+ if (dot < separator)
return "";
- in++;
- for (i=0 ; i<7 && *in ; i++,in++)
- exten[i] = *in;
+ dot++;
+ for (i = 0;i < 7 && dot[i];i++)
+ exten[i] = dot[i];
exten[i] = 0;
return exten;
}
+void FS_Dir_f(void);
+void FS_Ls_f(void);
/*
================
pak_mempool = Mem_AllocPool("paks");
Cmd_AddCommand ("path", FS_Path_f);
+ Cmd_AddCommand ("dir", FS_Dir_f);
+ Cmd_AddCommand ("ls", FS_Ls_f);
strcpy(fs_basedir, ".");
+ PK3_OpenLibrary ();
+
// -basedir <path>
// Overrides the system supplied base directory (under GAMENAME)
i = COM_CheckParm ("-basedir");
if (i && i < com_argc-1)
- strcpy (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;
// start up with GAMENAME by default (id1)
- strcpy(com_modname, GAMENAME);
+ strlcpy (com_modname, GAMENAME, sizeof (com_modname));
FS_AddGameDirectory (va("%s/"GAMENAME, fs_basedir));
if (gamedirname[0])
{
fs_modified = true;
- strcpy(com_modname, gamedirname);
+ strlcpy (com_modname, gamedirname, sizeof (com_modname));
FS_AddGameDirectory (va("%s/%s", fs_basedir, gamedirname));
}
if (i && i < com_argc-1)
{
fs_modified = true;
- strcpy(com_modname, com_argv[i+1]);
+ strlcpy (com_modname, com_argv[i+1], sizeof (com_modname));
FS_AddGameDirectory (va("%s/%s", fs_basedir, com_argv[i+1]));
}
Sys_Error ("Couldn't load packfile: %s", com_argv[i]);
}
else
- strcpy (search->filename, com_argv[i]);
+ strlcpy (search->filename, com_argv[i], sizeof (search->filename));
search->next = fs_searchpaths;
fs_searchpaths = search;
}
}
-/*
-=============================================================================
-
-MAIN PUBLIC FUNCTIONS
-
-=============================================================================
-*/
-
/*
====================
-FS_Open
+FS_SysOpen
Internal function used to create a qfile_t and open the relevant file on disk
====================
// Normal file
if (offs < 0 || len < 0)
{
- FS_Seek (file, 0, SEEK_END);
- len = FS_Tell (file);
- FS_Seek (file, 0, SEEK_SET);
+ // We set fs_filesize here for normal files
+ fseek (file->stream, 0, SEEK_END);
+ fs_filesize = ftell (file->stream);
+ fseek (file->stream, 0, SEEK_SET);
}
// Packed file
else
{
- FS_Seek (file, offs, SEEK_SET);
+ fseek (file->stream, offs, SEEK_SET);
file->flags |= FS_FLAG_PACKED;
file->length = len;
file->position = 0;
}
- fs_filesize = len;
-
return file;
}
searchpath_t *search;
char netpath[MAX_OSPATH];
pack_t *pak;
- int i, filenamelen;
+ int i, filenamelen, matched;
filenamelen = strlen (filename);
+ // LordHavoc: this is not written right!
+ // (should search have higher priority for files in each gamedir, while
+ // preserving the gamedir priorities, not searching for all paks in all
+ // gamedirs and then all files in all gamedirs)
+#ifdef AKVERSION
+ // first we search for a real file, after that we start to search through the paks
// search through the path, one element at a time
search = fs_searchpaths;
+ for( ; search ; search = search->next)
+ if(!search->pack)
+ {
+ snprintf (netpath, sizeof (netpath), "%s/%s",search->filename, filename);
+
+ if (!FS_SysFileExists (netpath))
+ continue;
+
+ if (!quiet)
+ Sys_Printf ("FindFile: %s\n",netpath);
+ return FS_OpenRead (netpath, -1, -1);
+ }
+
+ search = fs_searchpaths;
for ( ; search ; search = search->next)
- {
// is the element a pak file?
if (search->pack)
{
// look through all the pak file elements
pak = search->pack;
for (i=0 ; i<pak->numfiles ; i++)
- if (!strcmp (pak->files[i].name, filename)) // found it?
+ {
+ if (pak->ignorecase)
+ matched = !strcasecmp (pak->files[i].name, filename);
+ else
+ matched = !strcmp (pak->files[i].name, filename);
+ if (matched) // found it?
{
- // TODO: compressed files are NOT supported yet
- if (pak->files[i].flags & FILE_FLAG_DEFLATED)
+ qfile_t *file;
+
+ if (!quiet)
+ Sys_Printf ("PackFile: %s : %s\n",pak->filename, pak->files[i].name);
+
+ // If we don't have the true offset, get it now
+ if (! (pak->files[i].flags & FILE_FLAG_TRUEOFFS))
+ PK3_GetTrueFileOffset (&pak->files[i], pak);
+
+ // No Zlib DLL = no compressed files
+ if (!zlib_dll && (pak->files[i].flags & FILE_FLAG_DEFLATED))
{
- Con_Printf ("WARNING: %s is a compressed file and so cannot be opened\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;
return NULL;
}
+ // open a new file in the pakfile
+ file = FS_OpenRead (pak->filename, pak->files[i].offset, pak->files[i].packsize);
+ fs_filesize = pak->files[i].realsize;
+
+ if (pak->files[i].flags & FILE_FLAG_DEFLATED)
+ {
+ ztoolkit_t *ztk;
+
+ file->flags |= FS_FLAG_DEFLATED;
+
+ // We need some more variables
+ ztk = Mem_Alloc (fs_mempool, sizeof (*file->z));
+
+ ztk->real_length = pak->files[i].realsize;
+
+ // Initialize zlib stream
+ ztk->zstream.next_in = ztk->input;
+ ztk->zstream.avail_in = 0;
+
+ /* From Zlib's "unzip.c":
+ *
+ * windowBits is passed < 0 to tell that there is no zlib header.
+ * Note that in this case inflate *requires* an extra "dummy" byte
+ * after the compressed stream in order to complete decompression and
+ * return Z_STREAM_END.
+ * In unzip, i don't wait absolutely Z_STREAM_END because I known the
+ * size of both compressed and uncompressed data
+ */
+ if (qz_inflateInit2 (&ztk->zstream, -MAX_WBITS) != Z_OK)
+ Sys_Error ("inflate init error (file: %s)", filename);
+
+ ztk->zstream.next_out = ztk->output;
+ ztk->zstream.avail_out = sizeof (ztk->output);
+
+ file->z = ztk;
+ }
+
+ return file;
+ }
+ }
+ }
+#else
+ // search through the path, one element at a time
+ search = fs_searchpaths;
+
+ for ( ; search ; search = search->next)
+ {
+ // is the element a pak file?
+ if (search->pack)
+ {
+ // look through all the pak file elements
+ pak = search->pack;
+ for (i=0 ; i<pak->numfiles ; i++)
+ {
+ if (pak->ignorecase)
+ matched = !strcasecmp (pak->files[i].name, filename);
+ else
+ matched = !strcmp (pak->files[i].name, filename);
+ if (matched) // found it?
+ {
+ qfile_t *file;
+
if (!quiet)
Sys_Printf ("PackFile: %s : %s\n",pak->filename, pak->files[i].name);
if (! (pak->files[i].flags & FILE_FLAG_TRUEOFFS))
PK3_GetTrueFileOffset (&pak->files[i], pak);
+ // No Zlib DLL = no compressed files
+ if (!zlib_dll && (pak->files[i].flags & FILE_FLAG_DEFLATED))
+ {
+ 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;
+ return NULL;
+ }
+
// open a new file in the pakfile
- return FS_OpenRead (pak->filename, pak->files[i].offset, pak->files[i].packsize);
+ file = FS_OpenRead (pak->filename, pak->files[i].offset, pak->files[i].packsize);
+ fs_filesize = pak->files[i].realsize;
+
+ if (pak->files[i].flags & FILE_FLAG_DEFLATED)
+ {
+ ztoolkit_t *ztk;
+
+ file->flags |= FS_FLAG_DEFLATED;
+
+ // We need some more variables
+ ztk = Mem_Alloc (fs_mempool, sizeof (*file->z));
+
+ ztk->real_length = pak->files[i].realsize;
+
+ // Initialize zlib stream
+ ztk->zstream.next_in = ztk->input;
+ ztk->zstream.avail_in = 0;
+
+ /* From Zlib's "unzip.c":
+ *
+ * windowBits is passed < 0 to tell that there is no zlib header.
+ * Note that in this case inflate *requires* an extra "dummy" byte
+ * after the compressed stream in order to complete decompression and
+ * return Z_STREAM_END.
+ * In unzip, i don't wait absolutely Z_STREAM_END because I known the
+ * size of both compressed and uncompressed data
+ */
+ if (qz_inflateInit2 (&ztk->zstream, -MAX_WBITS) != Z_OK)
+ Sys_Error ("inflate init error (file: %s)", filename);
+
+ ztk->zstream.next_out = ztk->output;
+ ztk->zstream.avail_out = sizeof (ztk->output);
+
+ file->z = ztk;
+ }
+
+ return file;
}
+ }
}
else
{
- sprintf (netpath, "%s/%s",search->filename, filename);
+ snprintf (netpath, sizeof (netpath), "%s/%s",search->filename, filename);
if (!FS_SysFileExists (netpath))
continue;
return FS_OpenRead (netpath, -1, -1);
}
}
+#endif
if (!quiet)
Sys_Printf ("FindFile: can't find %s\n", filename);
}
+/*
+=============================================================================
+
+MAIN PUBLIC FUNCTIONS
+
+=============================================================================
+*/
+
/*
====================
FS_Open
if (fclose (file->stream))
return EOF;
+ if (file->z)
+ {
+ qz_inflateEnd (&file->z->zstream);
+ Mem_Free (file->z);
+ }
+
Mem_Free (file);
return 0;
}
*/
size_t FS_Read (qfile_t* file, void* buffer, size_t buffersize)
{
- size_t nb;
+ size_t count, nb;
+ ztoolkit_t *ztk;
- // If the file belongs to a package, we must take care
- // to not read after the end of the file
- if (file->flags & FS_FLAG_PACKED)
+ // Quick path for unpacked files
+ if (! (file->flags & FS_FLAG_PACKED))
+ return fread (buffer, 1, buffersize, file->stream);
+
+ // If the file isn't compressed
+ if (! (file->flags & FS_FLAG_DEFLATED))
{
- size_t remain = file->length - file->position;
- if (buffersize > remain)
- buffersize = remain;
+ // We must take care to not read after the end of the file
+ count = file->length - file->position;
+ if (buffersize > count)
+ buffersize = count;
+
+ nb = fread (buffer, 1, buffersize, file->stream);
+
+ file->position += nb;
+ return nb;
}
- nb = fread (buffer, 1, buffersize, file->stream);
+ // If the file is compressed, it's more complicated...
+ ztk = file->z;
+
+ // First, we copy as many bytes as we can from "output"
+ if (ztk->out_ind < ztk->out_max)
+ {
+ count = ztk->out_max - ztk->out_ind;
- // Update the position index if the file is packed
- if ((file->flags & FS_FLAG_PACKED) && nb > 0)
+ nb = (buffersize > count) ? count : buffersize;
+ memcpy (buffer, &ztk->output[ztk->out_ind], nb);
+ ztk->out_ind += nb;
file->position += nb;
+ }
+ else
+ nb = 0;
+
+ // We cycle through a few operations until we have inflated enough data
+ while (nb < buffersize)
+ {
+ // NOTE: at this point, "output" should always be empty
+
+ // If "input" is also empty, we need to fill it
+ if (ztk->in_ind == ztk->in_max)
+ {
+ size_t remain = file->length - ztk->in_position;
+
+ // If we are at the end of the file
+ if (!remain)
+ return nb;
+
+ count = (remain > sizeof (ztk->input)) ? sizeof (ztk->input) : remain;
+ fread (ztk->input, 1, count, file->stream);
+
+ // Update indexes and counters
+ ztk->in_ind = 0;
+ ztk->in_max = count;
+ ztk->in_position += count;
+ }
+
+ // Now that we are sure we have compressed data available, we need to determine
+ // if it's better to inflate it in "output" or directly in "buffer" (we are in this
+ // case if we still need more bytes than "output" can contain)
+
+ ztk->zstream.next_in = &ztk->input[ztk->in_ind];
+ ztk->zstream.avail_in = ztk->in_max - ztk->in_ind;
+
+ // If output will be able to contain at least 1 more byte than the data we need
+ if (buffersize - nb < sizeof (ztk->output))
+ {
+ int error;
+
+ // Inflate the data in "output"
+ ztk->zstream.next_out = ztk->output;
+ ztk->zstream.avail_out = sizeof (ztk->output);
+ error = qz_inflate (&ztk->zstream, Z_SYNC_FLUSH);
+ if (error != Z_OK && error != Z_STREAM_END)
+ Sys_Error ("Can't inflate file");
+ ztk->in_ind = ztk->in_max - ztk->zstream.avail_in;
+ ztk->out_max = sizeof (ztk->output) - ztk->zstream.avail_out;
+ ztk->out_position += ztk->out_max;
+
+ // Copy the requested data in "buffer" (as much as we can)
+ count = (buffersize - nb > ztk->out_max) ? ztk->out_max : buffersize - nb;
+ memcpy (&((qbyte*)buffer)[nb], ztk->output, count);
+ ztk->out_ind = count;
+ }
+
+ // Else, we inflate directly in "buffer"
+ else
+ {
+ int error;
+
+ // Inflate the data in "buffer"
+ ztk->zstream.next_out = &((qbyte*)buffer)[nb];
+ ztk->zstream.avail_out = buffersize - nb;
+ error = qz_inflate (&ztk->zstream, Z_SYNC_FLUSH);
+ if (error != Z_OK && error != Z_STREAM_END)
+ Sys_Error ("Can't inflate file");
+ ztk->in_ind = ztk->in_max - ztk->zstream.avail_in;
+
+ // Invalidate the output data (for FS_Seek)
+ ztk->out_max = 0;
+ ztk->out_ind = 0;
+
+ // How much data did it inflate?
+ count = buffersize - nb - ztk->zstream.avail_out;
+ ztk->out_position += count;
+ }
+
+ nb += count;
+ file->position += count;
+ }
return nb;
}
*/
int FS_Getc (qfile_t* file)
{
- int c;
-
- // If the file belongs to a package, we must take care
- // to not read after the end of the file
- if (file->flags & FS_FLAG_PACKED)
- {
- if (file->position >= file->length)
- return EOF;
- }
+ char c;
- c = fgetc (file->stream);
-
- // Update the position index if the file is packed
- if ((file->flags & FS_FLAG_PACKED) && c != EOF)
- file->position++;
+ if (FS_Read (file, &c, 1) != 1)
+ return EOF;
return c;
}
*/
int FS_Seek (qfile_t* file, long offset, int whence)
{
- // Packed files receive a special treatment
- if (file->flags & FS_FLAG_PACKED)
+ // Quick path for unpacked files
+ if (! (file->flags & FS_FLAG_PACKED))
+ return fseek (file->stream, offset, whence);
+
+ // Seeking in compressed files is more a hack than anything else,
+ // but we need to support it, so here it is.
+ if (file->flags & FS_FLAG_DEFLATED)
{
+ ztoolkit_t *ztk = file->z;
+ qbyte buffer [sizeof (ztk->output)]; // it's big to force inflating into buffer directly
+
switch (whence)
{
case SEEK_CUR:
offset += file->position;
- // It continues on the next case (no break)
+ break;
case SEEK_SET:
- if (offset < 0 || offset > file->length)
- return -1;
- if (fseek (file->stream, file->offset + offset, SEEK_SET) == -1)
- return -1;
- file->position = offset;
- return 0;
+ break;
case SEEK_END:
- if (offset > 0 || -offset > file->length)
- return -1;
- if (fseek (file->stream, file->offset + file->length + offset, SEEK_SET) == -1)
- return -1;
- file->position = file->length + offset;
- return 0;
+ offset += ztk->real_length;
+ break;
default:
return -1;
}
+ if (offset < 0 || offset > (long) ztk->real_length)
+ return -1;
+
+ // If we need to go back in the file
+ if (offset <= (long) file->position)
+ {
+ // If we still have the data we need in the output buffer
+ if (file->position - offset <= ztk->out_ind)
+ {
+ ztk->out_ind -= file->position - offset;
+ file->position = offset;
+ return 0;
+ }
+
+ // Else, we restart from the beginning of the file
+ ztk->in_ind = 0;
+ ztk->in_max = 0;
+ ztk->in_position = 0;
+ ztk->out_ind = 0;
+ ztk->out_max = 0;
+ ztk->out_position = 0;
+ file->position = 0;
+ fseek (file->stream, file->offset, SEEK_SET);
+
+ // Reset the Zlib stream
+ ztk->zstream.next_in = ztk->input;
+ ztk->zstream.avail_in = 0;
+ qz_inflateReset (&ztk->zstream);
+ }
+
+ // Skip all data until we reach the requested offset
+ while ((long) file->position < offset)
+ {
+ size_t diff = offset - file->position;
+ size_t count, len;
+
+ count = (diff > sizeof (buffer)) ? sizeof (buffer) : diff;
+ len = FS_Read (file, buffer, count);
+ if (len != count)
+ return -1;
+ }
+
+ return 0;
+ }
+
+ // Packed files receive a special treatment too, because
+ // we need to make sure it doesn't go outside of the file
+ switch (whence)
+ {
+ case SEEK_CUR:
+ offset += file->position;
+ break;
+
+ case SEEK_SET:
+ break;
+
+ case SEEK_END:
+ offset += file->length;
+ break;
+
+ default:
+ return -1;
}
+ if (offset < 0 || offset > (long) file->length)
+ return -1;
- return fseek (file->stream, offset, whence);
+ if (fseek (file->stream, file->offset + offset, SEEK_SET) == -1)
+ return -1;
+ file->position = offset;
+ return 0;
}
*/
char* FS_Gets (qfile_t* file, char* buffer, int buffersize)
{
- if (!fgets (buffer, buffersize, file->stream))
- return NULL;
+ size_t ind;
- // Check that we didn't read after the end of a packed file, and update the position
- if (file->flags & FS_FLAG_PACKED)
- {
- size_t len = strlen (buffer);
- size_t max = file->length - file->position;
+ // Quick path for unpacked files
+ if (! (file->flags & FS_FLAG_PACKED))
+ return fgets (buffer, buffersize, file->stream);
- if (len > max)
+ for (ind = 0; ind < (size_t) buffersize - 1; ind++)
+ {
+ int c = FS_Getc (file);
+ switch (c)
{
- buffer[max] = '\0';
- file->position = file->length;
+ // End of file
+ case -1:
+ if (!ind)
+ return NULL;
+
+ buffer[ind] = '\0';
+ return buffer;
+
+ // End of line
+ case '\r':
+ case '\n':
+ buffer[ind] = '\n';
+ buffer[ind + 1] = '\0';
+ return buffer;
+
+ default:
+ buffer[ind] = c;
}
- else
- file->position += len;
+
}
+ buffer[buffersize - 1] = '\0';
return buffer;
}
int FS_Eof (qfile_t* file)
{
if (file->flags & FS_FLAG_PACKED)
+ {
+ if (file->flags & FS_FLAG_DEFLATED)
+ return (file->position == file->z->real_length);
+
return (file->position == file->length);
-
+ }
+
return feof (file->stream);
}
FILE *handle;
char name[MAX_OSPATH];
- sprintf (name, "%s/%s", fs_gamedir, filename);
+ snprintf (name, sizeof (name), "%s/%s", fs_gamedir, filename);
// Create directories up to the file
FS_CreatePath (name);
FS_StripExtension
============
*/
-void FS_StripExtension (const char *in, char *out)
+void FS_StripExtension (const char *in, char *out, size_t size_out)
{
char *last = NULL;
- while (*in)
+
+ if (size_out == 0)
+ return;
+
+ while (*in && size_out > 1)
{
if (*in == '.')
last = out;
else if (*in == '/' || *in == '\\' || *in == ':')
last = NULL;
*out++ = *in++;
+ size_out--;
}
if (last)
*last = 0;
FS_DefaultExtension
==================
*/
-void FS_DefaultExtension (char *path, const char *extension)
+void FS_DefaultExtension (char *path, const char *extension, size_t size_path)
{
const char *src;
src--;
}
- strcat (path, extension);
+ strlcat (path, extension, size_path);
}
}
else
{
- sprintf (netpath, "%s/%s",search->filename, filename);
+ snprintf (netpath, sizeof (netpath), "%s/%s",search->filename, filename);
if (FS_SysFileExists (netpath))
return true;
}
mkdir (path, 0777);
#endif
}
+
+/*
+===========
+FS_Search
+
+Allocate and fill a search structure with information on matching filenames.
+===========
+*/
+fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet)
+{
+ fssearch_t *search;
+ searchpath_t *searchpath;
+ pack_t *pak;
+ int i, basepathlength, numfiles, numchars;
+ stringlist_t *dir, *dirfile, *liststart, *listcurrent, *listtemp;
+ const char *slash, *backslash, *colon, *separator;
+ char *basepath;
+ char netpath[MAX_OSPATH];
+ char temp[MAX_OSPATH];
+
+ while(!strncmp(pattern, "./", 2))
+ pattern += 2;
+ while(!strncmp(pattern, ".\\", 2))
+ pattern += 2;
+
+ search = NULL;
+ liststart = NULL;
+ listcurrent = NULL;
+ listtemp = 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;
+ basepath = Z_Malloc(basepathlength + 1);
+ if (basepathlength)
+ memcpy(basepath, pattern, basepathlength);
+ basepath[basepathlength] = 0;
+
+ // search through the path, one element at a time
+ for (searchpath = fs_searchpaths;searchpath;searchpath = searchpath->next)
+ {
+ // is the element a pak file?
+ if (searchpath->pack)
+ {
+ // look through all the pak file elements
+ pak = searchpath->pack;
+ for (i = 0;i < pak->numfiles;i++)
+ {
+ strcpy(temp, pak->files[i].name);
+ while (temp[0])
+ {
+ if (matchpattern(temp, (char *)pattern, true))
+ {
+ 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)
+ Sys_Printf("SearchPackFile: %s : %s\n", pak->filename, temp);
+ }
+ }
+ // strip off one path element at a time until empty
+ // this way directories are added to the listing if they match the pattern
+ slash = strrchr(temp, '/');
+ backslash = strrchr(temp, '\\');
+ colon = strrchr(temp, ':');
+ separator = temp;
+ if (separator < slash)
+ separator = slash;
+ if (separator < backslash)
+ separator = backslash;
+ if (separator < colon)
+ separator = colon;
+ *((char *)separator) = 0;
+ }
+ }
+ }
+ else
+ {
+ // get a directory listing and look at each name
+ snprintf(netpath, sizeof (netpath), "%s/%s", searchpath->filename, basepath);
+ if ((dir = listdirectory(netpath)))
+ {
+ for (dirfile = dir;dirfile;dirfile = dirfile->next)
+ {
+ memcpy(temp, basepath, basepathlength);
+ strcpy(temp + basepathlength, dirfile->text);
+ if (matchpattern(temp, (char *)pattern, true))
+ {
+ 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)
+ Sys_Printf("SearchDirFile: %s\n", temp);
+ }
+ }
+ }
+ freedirectory(dir);
+ }
+ }
+ }
+
+ if (liststart)
+ {
+ liststart = stringlistsort(liststart);
+ numfiles = 0;
+ 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 *));
+ search->filenames = (char **)((char *)search + sizeof(fssearch_t));
+ search->filenamesbuffer = (char *)((char *)search + sizeof(fssearch_t) + numfiles * sizeof(char *));
+ search->numfilenames = numfiles;
+ numfiles = 0;
+ numchars = 0;
+ for (listtemp = liststart;listtemp;listtemp = listtemp->next)
+ {
+ search->filenames[numfiles] = search->filenamesbuffer + numchars;
+ strcpy(search->filenames[numfiles], listtemp->text);
+ numfiles++;
+ numchars += strlen(listtemp->text) + 1;
+ }
+ if (liststart)
+ stringlistfree(liststart);
+ }
+
+ Z_Free(basepath);
+ return search;
+}
+
+void FS_FreeSearch(fssearch_t *search)
+{
+ Z_Free(search);
+}
+
+extern int con_linewidth;
+int FS_ListDirectory(const char *pattern, int oneperline)
+{
+ int numfiles;
+ int numcolumns;
+ int numlines;
+ int columnwidth;
+ int linebufpos;
+ int i, j, k, l;
+ const char *name;
+ char linebuf[4096];
+ fssearch_t *search;
+ search = FS_Search(pattern, true, false);
+ if (!search)
+ return 0;
+ numfiles = search->numfilenames;
+ if (!oneperline)
+ {
+ // FIXME: the names could be added to one column list and then
+ // gradually shifted into the next column if they fit, and then the
+ // next to make a compact variable width listing but it's a lot more
+ // complicated...
+ // find width for columns
+ columnwidth = 0;
+ for (i = 0;i < numfiles;i++)
+ {
+ l = strlen(search->filenames[i]);
+ if (columnwidth < l)
+ columnwidth = l;
+ }
+ // count the spacing character
+ columnwidth++;
+ // calculate number of columns
+ numcolumns = con_linewidth / columnwidth;
+ // don't bother with the column printing if it's only one column
+ if (numcolumns >= 2)
+ {
+ numlines = (numfiles + numcolumns - 1) / numcolumns;
+ for (i = 0;i < numlines;i++)
+ {
+ linebufpos = 0;
+ for (k = 0;k < numcolumns;k++)
+ {
+ l = i * numcolumns + k;
+ if (l < numfiles)
+ {
+ name = search->filenames[l];
+ for (j = 0;name[j] && j < (int)sizeof(linebuf) - 1;j++)
+ linebuf[linebufpos++] = name[j];
+ // space out name unless it's the last on the line
+ if (k < (numcolumns - 1) && l < (numfiles - 1))
+ for (;j < columnwidth && j < (int)sizeof(linebuf) - 1;j++)
+ linebuf[linebufpos++] = ' ';
+ }
+ }
+ linebuf[linebufpos] = 0;
+ Con_Printf("%s\n", linebuf);
+ }
+ }
+ else
+ oneperline = true;
+ }
+ if (oneperline)
+ for (i = 0;i < numfiles;i++)
+ Con_Printf("%s\n", search->filenames[i]);
+ FS_FreeSearch(search);
+ return numfiles;
+}
+
+void FS_Dir_f(void)
+{
+ char pattern[MAX_OSPATH];
+ if (Cmd_Argc() > 3)
+ {
+ Con_Printf("usage:\ndir [path/pattern]\n");
+ return;
+ }
+ strcpy(pattern, "*");
+ if (Cmd_Argc() == 2)
+ snprintf(pattern, sizeof(pattern), "%s", Cmd_Argv(1));
+ if (!FS_ListDirectory(pattern, true))
+ Con_Printf("No files found.\n");
+}
+
+void FS_Ls_f(void)
+{
+ char pattern[MAX_OSPATH];
+ if (Cmd_Argc() > 3)
+ {
+ Con_Printf("usage:\nls [path/pattern]\n");
+ return;
+ }
+ strcpy(pattern, "*");
+ if (Cmd_Argc() == 2)
+ snprintf(pattern, sizeof(pattern), "%s", Cmd_Argv(1));
+ FS_ListDirectory(pattern, false);
+}
+
projects / xonotic / darkplaces.git / blobdiff