DarkPlaces file system
Copyright (C) 2003-2005 Mathieu Olivier
- Copyright (C) 1999,2000 contributors of the QuakeForge project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
# define O_BINARY 0
#endif
+// In case the system doesn't support the O_NONBLOCK flag
+#ifndef O_NONBLOCK
+# define O_NONBLOCK 0
+#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
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);
/*
qboolean fs_modified; // set true if using non-id files
+cvar_t scr_screenshot_name = {0, "scr_screenshot_name","dp"};
+
/*
=============================================================================
*/
// 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
qboolean PK3_GetEndOfCentralDir (const char *packfile, int packhandle, pk3_endOfCentralDir_t *eocd)
{
long filesize, maxsize;
- qbyte *buffer, *ptr;
+ 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);
#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->files = (packfile_t *)Mem_Alloc(fs_mempool, eocd.nbentries * sizeof(packfile_t));
pack->next = packlist;
packlist = pack;
*/
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?
*/
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;
return NULL;
}
- pack = Mem_Alloc(fs_mempool, sizeof (pack_t));
+ 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->files = (packfile_t *)Mem_Alloc(fs_mempool, numpackfiles * sizeof(packfile_t));
pack->next = packlist;
packlist = pack;
- info = Mem_Alloc(tempmempool, sizeof(*info) * numpackfiles);
+ info = (dpackfile_t *)Mem_Alloc(tempmempool, sizeof(*info) * numpackfiles);
lseek (packhandle, header.dirofs, SEEK_SET);
read (packhandle, (void *)info, header.dirlen);
pak = FS_LoadPackPAK (pakfile);
if (pak)
{
- search = Mem_Alloc(fs_mempool, sizeof(searchpath_t));
+ search = (searchpath_t *)Mem_Alloc(fs_mempool, sizeof(searchpath_t));
search->pack = pak;
search->next = fs_searchpaths;
fs_searchpaths = search;
pak = FS_LoadPackPK3 (pakfile);
if (pak)
{
- search = Mem_Alloc(fs_mempool, sizeof(searchpath_t));
+ search = (searchpath_t *)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(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;
if (strstr(com_argv[0], ".app/"))
{
char *split;
- char temp[4096];
+
split = strstr(com_argv[0], ".app/");
while (split > com_argv[0] && *split != '/')
split--;
if (!com_argv[i] || com_argv[i][0] == '+' || com_argv[i][0] == '-')
break;
- search = Mem_Alloc(fs_mempool, sizeof(searchpath_t));
+ 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]);
}
}
-#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;
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;
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 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");
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)
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
char *tempbuff = NULL;
buff_size = 1024;
- tempbuff = Mem_Alloc (tempmempool, buff_size);
+ tempbuff = (char *)Mem_Alloc (tempmempool, buff_size);
len = dpvsnprintf (tempbuff, buff_size, format, ap);
while (len < 0)
{
Mem_Free (tempbuff);
buff_size *= 2;
- tempbuff = Mem_Alloc (tempmempool, buff_size);
+ tempbuff = (char *)Mem_Alloc (tempmempool, buff_size);
len = dpvsnprintf (tempbuff, buff_size, format, ap);
}
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 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)
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)
{
qfile_t *file;
- qbyte *buf;
+ unsigned char *buf;
file = FS_Open (path, "rb", quiet, false);
if (!file)
return NULL;
- buf = Mem_Alloc (pool, fs_filesize + 1);
+ buf = (unsigned char *)Mem_Alloc (pool, fs_filesize + 1);
buf[fs_filesize] = '\0';
FS_Read (file, buf, fs_filesize);
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;
for (listtemp = liststart;listtemp;listtemp = listtemp->next)
{
numfiles++;
- numchars += strlen(listtemp->text) + 1;
+ numchars += (int)strlen(listtemp->text) + 1;
}
- search = Z_Malloc(sizeof(fssearch_t) + numchars + numfiles * sizeof(char *));
+ 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;
search->filenames[numfiles] = search->filenamesbuffer + numchars;
strcpy(search->filenames[numfiles], listtemp->text);
numfiles++;
- numchars += strlen(listtemp->text) + 1;
+ numchars += (int)strlen(listtemp->text) + 1;
}
if (liststart)
stringlistfree(liststart);
columnwidth = 0;
for (i = 0;i < numfiles;i++)
{
- l = strlen(search->filenames[i]);
+ l = (int)strlen(search->filenames[i]);
if (columnwidth < l)
columnwidth = l;
}
projects / xonotic / darkplaces.git / blobdiff