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
- size_t real_length; // uncompressed file size (for files opened in "read" mode)
- size_t position; // current position in the file
- size_t offset; // offset into the package (0 if external file)
+ fs_offset_t real_length; // uncompressed file size (for files opened in "read" mode)
+ fs_offset_t position; // current position in the file
+ fs_offset_t offset; // offset into the package (0 if external 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
void FS_Ls_f(void);
static packfile_t* FS_AddFileToPack (const char* name, pack_t* pack,
- size_t offset, size_t packsize,
- size_t realsize, packfile_flags_t flags);
+ fs_offset_t offset, fs_offset_t packsize,
+ fs_offset_t realsize, int flags);
/*
mempool_t *fs_mempool;
-size_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", "prefix name for saved screenshots (changes based on -game commandline, as well as which game mode is running)"};
+
/*
=============================================================================
*/
// 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;
+ fs_offset_t filesize, maxsize;
+ 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) != (ssize_t) maxsize)
+ if (read (packhandle, buffer, maxsize) != (fs_offset_t) maxsize)
{
Mem_Free (buffer);
return false;
*/
int PK3_BuildFileList (pack_t *pack, const pk3_endOfCentralDir_t *eocd)
{
- qbyte *central_dir, *ptr;
+ unsigned char *central_dir, *ptr;
unsigned int ind;
- size_t remaining;
+ 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);
ptr = central_dir;
for (ind = 0; ind < eocd->nbentries; ind++)
{
- size_t namesize, count;
+ fs_offset_t namesize, count;
// Checking the remaining size
if (remaining < ZIP_CDIR_CHUNK_BASE_SIZE)
if ((ptr[8] & 0x29) == 0 && (ptr[38] & 0x18) == 0)
{
// Still enough bytes for the name?
- if (remaining < namesize || namesize >= sizeof (*pack->files))
+ if (remaining < namesize || namesize >= (int)sizeof (*pack->files))
{
Mem_Free (central_dir);
return -1;
if (ptr[ZIP_CDIR_CHUNK_BASE_SIZE + namesize - 1] != '/')
{
char filename [sizeof (pack->files[0].name)];
- size_t offset, packsize, realsize;
- packfile_flags_t flags;
+ fs_offset_t offset, packsize, realsize;
+ int flags;
// Extract the name (strip it if necessary)
- if (namesize >= sizeof (filename))
- namesize = sizeof (filename) - 1;
+ namesize = min(namesize, (int)sizeof (filename) - 1);
memcpy (filename, &ptr[ZIP_CDIR_CHUNK_BASE_SIZE], namesize);
filename[namesize] = '\0';
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;
}
#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;
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;
*/
qboolean PK3_GetTrueFileOffset (packfile_t *pfile, pack_t *pack)
{
- qbyte buffer [ZIP_LOCAL_CHUNK_BASE_SIZE];
- size_t count;
+ unsigned char buffer [ZIP_LOCAL_CHUNK_BASE_SIZE];
+ fs_offset_t count;
// Already found?
if (pfile->flags & PACKFILE_FLAG_TRUEOFFS)
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;
}
====================
*/
static packfile_t* FS_AddFileToPack (const char* name, pack_t* pack,
- size_t offset, size_t packsize,
- size_t realsize, packfile_flags_t flags)
+ fs_offset_t offset, fs_offset_t packsize,
+ fs_offset_t realsize, int flags)
{
int (*strcmp_funct) (const char* str1, const char* str2);
int left, right, middle;
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;
}
- 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);
// parse the directory
for (i = 0;i < numpackfiles;i++)
{
- size_t offset = LittleLong (info[i].filepos);
- size_t size = LittleLong (info[i].filelen);
+ fs_offset_t offset = LittleLong (info[i].filepos);
+ fs_offset_t size = LittleLong (info[i].filelen);
FS_AddFileToPack (info[i].name, pack, offset, size, size, PACKFILE_FLAG_TRUEOFFS);
}
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;
#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
fs_mempool = Mem_AllocPool("file management", 0, NULL);
- strcpy(fs_basedir, ".");
+ strcpy(fs_basedir, "");
strcpy(fs_gamedir, "");
#ifdef MACOSX
if (strstr(com_argv[0], ".app/"))
{
char *split;
- char temp[4096];
+
split = strstr(com_argv[0], ".app/");
while (split > com_argv[0] && *split != '/')
split--;
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 = 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]);
if (!search->pack)
{
- Con_Printf ("Couldn't load packfile: %s", com_argv[i]);
+ Con_Printf ("Couldn't load packfile: %s\n", com_argv[i]);
Mem_Free(search);
continue;
}
search->pack = FS_LoadPackPK3 (com_argv[i]);
if (!search->pack)
{
- Con_Printf ("Couldn't load packfile: %s", com_argv[i]);
+ Con_Printf ("Couldn't load packfile: %s\n", com_argv[i]);
Mem_Free(search);
continue;
}
{
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
}
}
-#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;
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;
}
- 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;
*/
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);
}
Write "datasize" bytes into a file
====================
*/
-size_t FS_Write (qfile_t* file, const void* data, size_t datasize)
+fs_offset_t FS_Write (qfile_t* file, const void* data, size_t datasize)
{
- ssize_t result;
+ fs_offset_t result;
// If necessary, seek to the exact file position we're supposed to be
if (file->buff_ind != file->buff_len)
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;
Read up to "buffersize" bytes from a file
====================
*/
-size_t FS_Read (qfile_t* file, void* buffer, size_t buffersize)
+fs_offset_t FS_Read (qfile_t* file, void* buffer, size_t buffersize)
{
- size_t count, done;
+ fs_offset_t count, done;
if (buffersize == 0)
return 0;
{
count = file->buff_len - file->buff_ind;
- done += (buffersize > count) ? count : buffersize;
+ done += ((fs_offset_t)buffersize > count) ? count : (fs_offset_t)buffersize;
memcpy (buffer, &file->buff[file->buff_ind], done);
file->buff_ind += done;
// 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 we have a lot of data to get, put them directly into "buffer"
if (buffersize > sizeof (file->buff) / 2)
{
- if (count > buffersize)
- count = buffersize;
+ 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;
}
else
{
- if (count > sizeof (file->buff))
- count = sizeof (file->buff);
+ if (count > (fs_offset_t)sizeof (file->buff))
+ count = (fs_offset_t)sizeof (file->buff);
lseek (file->handle, file->offset + file->position, SEEK_SET);
nb = read (file->handle, file->buff, count);
if (nb > 0)
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;
- if (count > sizeof (ztk->input))
- count = sizeof (ztk->input);
- lseek (file->handle, file->offset + ztk->in_position, SEEK_SET);
- if (read (file->handle, ztk->input, count) != (ssize_t)count)
+ 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 + (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;
- 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)
{
- 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;
// 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
*/
int FS_Print (qfile_t* file, const char *msg)
{
- return FS_Write (file, msg, strlen (msg));
+ return (int)FS_Write (file, msg, strlen (msg));
}
/*
int FS_VPrintf (qfile_t* file, const char* format, va_list ap)
{
int len;
- size_t buff_size;
- char *tempbuff = NULL;
+ fs_offset_t buff_size = MAX_INPUTLINE;
+ char *tempbuff;
- buff_size = 1024;
- tempbuff = Mem_Alloc (tempmempool, buff_size);
- len = dpvsnprintf (tempbuff, buff_size, format, ap);
- while (len < 0)
+ for (;;)
{
+ 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;
- tempbuff = Mem_Alloc (tempmempool, buff_size);
- len = dpvsnprintf (tempbuff, buff_size, format, ap);
}
len = write (file->handle, tempbuff, len);
Move the position index in a file
====================
*/
-int FS_Seek (qfile_t* file, long offset, int whence)
+int FS_Seek (qfile_t* file, fs_offset_t offset, int whence)
{
ztoolkit_t *ztk;
- qbyte* buffer;
- size_t buffersize;
+ 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 - file->buff_len <= (size_t)offset &&
- (size_t)offset <= file->position)
+ if (file->position - file->buff_len <= offset && offset <= file->position)
{
file->buff_ind = offset + file->buff_len - file->position;
return 0;
ztk = file->ztk;
// If we have to go back in the file, we need to restart from the beginning
- if ((size_t)offset <= file->position)
+ if (offset <= file->position)
{
ztk->in_ind = 0;
ztk->in_len = 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 ((size_t)offset > file->position)
+ while (offset > file->position)
{
- size_t diff = offset - file->position;
- size_t count, len;
+ fs_offset_t diff = offset - file->position;
+ fs_offset_t count, len;
count = (diff > buffersize) ? buffersize : diff;
len = FS_Read (file, buffer, count);
Give the current position in a file
====================
*/
-size_t FS_Tell (qfile_t* file)
+fs_offset_t FS_Tell (qfile_t* file)
{
return file->position - file->buff_len + file->buff_ind;
}
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, fs_offset_t *filesizepointer)
{
qfile_t *file;
- qbyte *buf;
+ unsigned char *buf = NULL;
+ fs_offset_t filesize = 0;
file = FS_Open (path, "rb", quiet, false);
- if (!file)
- return NULL;
-
- buf = 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;
}
The filename will be prefixed by the current game directory
============
*/
-qboolean FS_WriteFile (const char *filename, void *data, size_t len)
+qboolean FS_WriteFile (const char *filename, void *data, fs_offset_t len)
{
qfile_t *file;
fssearch_t *search;
searchpath_t *searchpath;
pack_t *pak;
- size_t i, basepathlength, numfiles, numchars;
+ int i, basepathlength, numfiles, numchars;
stringlist_t *dir, *dirfile, *liststart, *listcurrent, *listtemp;
const char *slash, *backslash, *colon, *separator;
char *basepath;
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 = numfiles;
+ search->numfilenames = (int)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;
+ numchars += (int)strlen(listtemp->text) + 1;
}
if (liststart)
stringlistfree(liststart);
extern int con_linewidth;
int FS_ListDirectory(const char *pattern, int oneperline)
{
- size_t numfiles;
- size_t numcolumns;
- size_t numlines;
- size_t columnwidth;
- size_t linebufpos;
- size_t i, j, k, l;
+ int numfiles;
+ int numcolumns;
+ int numlines;
+ int columnwidth;
+ 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)
columnwidth = 0;
for (i = 0;i < numfiles;i++)
{
- l = strlen(search->filenames[i]);
+ l = (int)strlen(search->filenames[i]);
if (columnwidth < l)
columnwidth = l;
}
if (l < numfiles)
{
name = search->filenames[l];
- for (j = 0;name[j] && linebufpos + 1 < sizeof(linebuf);j++)
+ for (j = 0;name[j] && linebufpos + 1 < (int)sizeof(linebuf);j++)
linebuf[linebufpos++] = name[j];
// space out name unless it's the last on the line
if (k + 1 < numcolumns && l + 1 < numfiles)
- for (;j < columnwidth && linebufpos + 1 < sizeof(linebuf);j++)
+ for (;j < columnwidth && linebufpos + 1 < (int)sizeof(linebuf);j++)
linebuf[linebufpos++] = ' ';
}
}
for (i = 0;i < numfiles;i++)
Con_Printf("%s\n", search->filenames[i]);
FS_FreeSearch(search);
- return numfiles;
+ return (int)numfiles;
}
static void FS_ListDirectoryCmd (const char* cmdname, int oneperline)
projects / xonotic / darkplaces.git / blobdiff