X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=fs.c;h=b34116971f36d159af3da2d1fcdbcd629df0520f;hp=752fa994630393c6cc28d1ae1fb8dbda465ab939;hb=f499e85f5a0f00c4bde11a4e2023d71d40c17055;hpb=3bac2784a89521dea698cbca8d9373a364c99039 diff --git a/fs.c b/fs.c index 752fa994..b3411697 100644 --- a/fs.c +++ b/fs.c @@ -148,9 +148,9 @@ struct qfile_s { qfile_flags_t 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 @@ -206,9 +206,9 @@ typedef struct { 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) + 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 @@ -218,7 +218,6 @@ typedef struct pack_s int ignorecase; // PK3 ignores case int numfiles; packfile_t *files; - mempool_t *mempool; struct pack_s *next; } pack_t; @@ -245,8 +244,8 @@ void FS_Dir_f(void); 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, packfile_flags_t flags); /* @@ -258,9 +257,8 @@ VARIABLES */ mempool_t *fs_mempool; -mempool_t *pak_mempool; -int fs_filesize; +fs_offset_t fs_filesize; pack_t *packlist = NULL; @@ -386,7 +384,7 @@ qboolean PK3_GetEndOfCentralDir (const char *packfile, int packhandle, pk3_endOf maxsize = ZIP_MAX_COMMENTS_SIZE + ZIP_END_CDIR_SIZE; buffer = 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; @@ -435,7 +433,7 @@ int PK3_BuildFileList (pack_t *pack, const pk3_endOfCentralDir_t *eocd) { qbyte *central_dir, *ptr; unsigned int ind; - int remaining; + fs_offset_t remaining; // Load the central directory in memory central_dir = Mem_Alloc (tempmempool, eocd->cdir_size); @@ -450,7 +448,7 @@ int PK3_BuildFileList (pack_t *pack, const pk3_endOfCentralDir_t *eocd) 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) @@ -477,7 +475,7 @@ int PK3_BuildFileList (pack_t *pack, const pk3_endOfCentralDir_t *eocd) if ((ptr[8] & 0x29) == 0 && (ptr[38] & 0x18) == 0) { // Still enough bytes for the name? - if ((size_t) remaining < namesize || namesize >= sizeof (*pack->files)) + if (remaining < namesize || namesize >= (int)sizeof (*pack->files)) { Mem_Free (central_dir); return -1; @@ -487,12 +485,11 @@ int PK3_BuildFileList (pack_t *pack, const pk3_endOfCentralDir_t *eocd) if (ptr[ZIP_CDIR_CHUNK_BASE_SIZE + namesize - 1] != '/') { char filename [sizeof (pack->files[0].name)]; - size_t offset, packsize, realsize; + fs_offset_t offset, packsize, realsize; packfile_flags_t 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'; @@ -541,33 +538,49 @@ pack_t *FS_LoadPackPK3 (const char *packfile) return NULL; if (! PK3_GetEndOfCentralDir (packfile, packhandle, &eocd)) - Sys_Error ("%s is not a PK3 file", packfile); + { + Con_Printf ("%s is not a PK3 file", packfile); + close(packhandle); + return NULL; + } // Multi-volume ZIP archives are NOT allowed if (eocd.disknum != 0 || eocd.cdir_disknum != 0) - Sys_Error ("%s is a multi-volume ZIP archive", packfile); + { + Con_Printf ("%s is a multi-volume ZIP archive", packfile); + close(packhandle); + return NULL; + } // 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); + { + Con_Printf ("%s contains too many files (%hu)", packfile, eocd.nbentries); + close(packhandle); + return NULL; + } #endif // Create a package structure in memory - pack = Mem_Alloc (pak_mempool, sizeof (pack_t)); + pack = 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->mempool = Mem_AllocPool (packfile, 0, NULL); - pack->files = Mem_Alloc (pack->mempool, eocd.nbentries * sizeof(packfile_t)); + pack->files = 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) - Sys_Error ("%s is not a valid PK3 file", packfile); + { + Con_Printf ("%s is not a valid PK3 file", packfile); + close(pack->handle); + Mem_Free(pack); + return NULL; + } Con_Printf("Added packfile %s (%i files)\n", packfile, real_nb_files); return pack; @@ -581,25 +594,29 @@ PK3_GetTrueFileOffset Find where the true file data offset is ==================== */ -void PK3_GetTrueFileOffset (packfile_t *pfile, pack_t *pack) +qboolean PK3_GetTrueFileOffset (packfile_t *pfile, pack_t *pack) { qbyte buffer [ZIP_LOCAL_CHUNK_BASE_SIZE]; - size_t count; + fs_offset_t count; // Already found? if (pfile->flags & PACKFILE_FLAG_TRUEOFFS) - return; + return true; // Load the local file description lseek (pack->handle, pfile->offset, SEEK_SET); count = read (pack->handle, buffer, ZIP_LOCAL_CHUNK_BASE_SIZE); if (count != ZIP_LOCAL_CHUNK_BASE_SIZE || BuffBigLong (buffer) != ZIP_DATA_HEADER) - Sys_Error ("Can't retrieve file %s in package %s", pfile->name, pack->filename); + { + Con_Printf ("Can't retrieve file %s in package %s", pfile->name, pack->filename); + return false; + } // Skip name and extra field pfile->offset += BuffLittleShort (&buffer[26]) + BuffLittleShort (&buffer[28]) + ZIP_LOCAL_CHUNK_BASE_SIZE; pfile->flags |= PACKFILE_FLAG_TRUEOFFS; + return true; } @@ -620,8 +637,8 @@ Add a file to the list of files contained into a package ==================== */ 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, packfile_flags_t flags) { int (*strcmp_funct) (const char* str1, const char* str2); int left, right, middle; @@ -641,8 +658,7 @@ static packfile_t* FS_AddFileToPack (const char* name, pack_t* pack, // If we found the file, there's a problem if (!diff) - Sys_Error ("Package %s contains the file %s several times\n", - pack->filename, name); + Con_Printf ("Package %s contains the file %s several times\n", pack->filename, name); // If we're too far in the list if (diff > 0) @@ -705,9 +721,7 @@ void FS_Path_f (void) for (s=fs_searchpaths ; s ; s=s->next) { if (s->pack) - { Con_Printf("%s (%i files)\n", s->pack->filename, s->pack->numfiles); - } else Con_Printf("%s\n", s->filename); } @@ -737,25 +751,36 @@ pack_t *FS_LoadPackPAK (const char *packfile) return NULL; read (packhandle, (void *)&header, sizeof(header)); if (memcmp(header.id, "PACK", 4)) - Sys_Error ("%s is not a packfile", packfile); + { + Con_Printf ("%s is not a packfile", packfile); + close(packhandle); + return NULL; + } header.dirofs = LittleLong (header.dirofs); header.dirlen = LittleLong (header.dirlen); if (header.dirlen % sizeof(dpackfile_t)) - Sys_Error ("%s has an invalid directory size", packfile); + { + Con_Printf ("%s has an invalid directory size", packfile); + close(packhandle); + return NULL; + } numpackfiles = header.dirlen / sizeof(dpackfile_t); if (numpackfiles > MAX_FILES_IN_PACK) - Sys_Error ("%s has %i files", packfile, numpackfiles); + { + Con_Printf ("%s has %i files", packfile, numpackfiles); + close(packhandle); + return NULL; + } - pack = Mem_Alloc(pak_mempool, sizeof (pack_t)); + pack = 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->mempool = Mem_AllocPool(packfile, 0, NULL); - pack->files = Mem_Alloc(pack->mempool, numpackfiles * sizeof(packfile_t)); + pack->files = Mem_Alloc(fs_mempool, numpackfiles * sizeof(packfile_t)); pack->next = packlist; packlist = pack; @@ -766,8 +791,8 @@ pack_t *FS_LoadPackPAK (const char *packfile) // 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); } @@ -803,11 +828,11 @@ void FS_AddGameDirectory (const char *dir) { if (matchpattern(current->text, "*.pak", true)) { - dpsnprintf (pakfile, sizeof (pakfile), "%s/%s", dir, current->text); + dpsnprintf (pakfile, sizeof (pakfile), "%s%s", dir, current->text); pak = FS_LoadPackPAK (pakfile); if (pak) { - search = Mem_Alloc(pak_mempool, sizeof(searchpath_t)); + search = Mem_Alloc(fs_mempool, sizeof(searchpath_t)); search->pack = pak; search->next = fs_searchpaths; fs_searchpaths = search; @@ -822,11 +847,11 @@ void FS_AddGameDirectory (const char *dir) { if (matchpattern(current->text, "*.pk3", true)) { - dpsnprintf (pakfile, sizeof (pakfile), "%s/%s", dir, current->text); + dpsnprintf (pakfile, sizeof (pakfile), "%s%s", dir, current->text); pak = FS_LoadPackPK3 (pakfile); if (pak) { - search = Mem_Alloc(pak_mempool, sizeof(searchpath_t)); + search = Mem_Alloc(fs_mempool, sizeof(searchpath_t)); search->pack = pak; search->next = fs_searchpaths; fs_searchpaths = search; @@ -839,7 +864,7 @@ void FS_AddGameDirectory (const char *dir) // Add the directory to the search path // (unpacked files have the priority over packed files) - search = Mem_Alloc(pak_mempool, sizeof(searchpath_t)); + search = Mem_Alloc(fs_mempool, sizeof(searchpath_t)); strlcpy (search->filename, dir, sizeof (search->filename)); search->next = fs_searchpaths; fs_searchpaths = search; @@ -853,17 +878,19 @@ FS_AddGameHierarchy */ void FS_AddGameHierarchy (const char *dir) { +#ifndef WIN32 const char *homedir; - - strlcpy (com_modname, dir, sizeof (com_modname)); +#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 homedir = getenv ("HOME"); if (homedir != NULL && homedir[0] != '\0') - FS_AddGameDirectory (va("%s/.%s/%s", homedir, gameuserdirname, dir)); + FS_AddGameDirectory (va("%s/.%s/%s/", homedir, gameuserdirname, dir)); +#endif } @@ -903,16 +930,23 @@ void FS_Init (void) searchpath_t *search; fs_mempool = Mem_AllocPool("file management", 0, NULL); - pak_mempool = Mem_AllocPool("paks", 0, NULL); - - Cvar_RegisterVariable (&scr_screenshot_name); - - Cmd_AddCommand ("path", FS_Path_f); - Cmd_AddCommand ("dir", FS_Dir_f); - Cmd_AddCommand ("ls", FS_Ls_f); strcpy(fs_basedir, "."); - strcpy(fs_gamedir, "."); + strcpy(fs_gamedir, ""); + +#ifdef MACOSX + // FIXME: is there a better way to find the directory outside the .app? + if (strstr(com_argv[0], ".app/")) + { + char *split; + char temp[4096]; + split = strstr(com_argv[0], ".app/"); + while (split > com_argv[0] && *split != '/') + split--; + strlcpy(fs_basedir, com_argv[0], sizeof(fs_basedir)); + fs_basedir[split - com_argv[0]] = 0; + } +#endif PK3_OpenLibrary (); @@ -923,7 +957,7 @@ void FS_Init (void) if (i && i < com_argc-1) { strlcpy (fs_basedir, com_argv[i+1], sizeof (fs_basedir)); - i = strlen (fs_basedir); + i = (int)strlen (fs_basedir); if (i > 0 && (fs_basedir[i-1] == '\\' || fs_basedir[i-1] == '/')) fs_basedir[i-1] = 0; } @@ -940,18 +974,26 @@ void FS_Init (void) if (!com_argv[i] || com_argv[i][0] == '+' || com_argv[i][0] == '-') break; - search = Mem_Alloc(pak_mempool, sizeof(searchpath_t)); + search = 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) - Sys_Error ("Couldn't load packfile: %s", com_argv[i]); + { + Con_Printf ("Couldn't load packfile: %s", com_argv[i]); + Mem_Free(search); + continue; + } } else if (!strcasecmp (FS_FileExtension (com_argv[i]), "pk3")) { search->pack = FS_LoadPackPK3 (com_argv[i]); if (!search->pack) - Sys_Error ("Couldn't load packfile: %s", com_argv[i]); + { + Con_Printf ("Couldn't load packfile: %s", com_argv[i]); + Mem_Free(search); + continue; + } } else strlcpy (search->filename, com_argv[i], sizeof (search->filename)); @@ -964,7 +1006,6 @@ void FS_Init (void) // add the game-specific paths // gamedirname1 (typically id1) FS_AddGameHierarchy (gamedirname1); - Cvar_SetQuick (&scr_screenshot_name, gamescreenshotname); // add the game-specific path, if any if (gamedirname2) @@ -973,6 +1014,9 @@ void FS_Init (void) FS_AddGameHierarchy (gamedirname2); } + // set the com_modname (reported in server info) + strlcpy(com_modname, gamedirname1, sizeof(com_modname)); + // -game // Adds basedir/gamedir as an override game // LordHavoc: now supports multiple -game directories @@ -985,7 +1029,8 @@ void FS_Init (void) i++; fs_modified = true; FS_AddGameHierarchy (com_argv[i]); - Cvar_SetQuick (&scr_screenshot_name, com_modname); + // update the com_modname + strlcpy (com_modname, com_argv[i], sizeof (com_modname)); } } @@ -994,6 +1039,22 @@ void FS_Init (void) unlink (va("%s/qconsole.log", fs_gamedir)); } +void FS_Init_Commands(void) +{ + Cvar_RegisterVariable (&scr_screenshot_name); + + Cmd_AddCommand ("path", FS_Path_f); + Cmd_AddCommand ("dir", FS_Dir_f); + Cmd_AddCommand ("ls", FS_Ls_f); + + // set the default screenshot name to either the mod name or the + // gamemode screenshot name + if (fs_modified) + Cvar_SetQuick (&scr_screenshot_name, com_modname); + else + Cvar_SetQuick (&scr_screenshot_name, gamescreenshotname); +} + /* ================ FS_Shutdown @@ -1001,7 +1062,6 @@ FS_Shutdown */ void FS_Shutdown (void) { - Mem_FreePool (&pak_mempool); Mem_FreePool (&fs_mempool); } @@ -1069,12 +1129,13 @@ static qfile_t* FS_SysOpen (const char* filepath, const char* mode, qboolean non return NULL; } - // For files opened in read mode, we now need to get the length - if (mod == O_RDONLY) - { - file->real_length = lseek (file->handle, 0, SEEK_END); + file->real_length = lseek (file->handle, 0, SEEK_END); + + // For files opened in append mode, we start at the end of the file + if (mod & O_APPEND) + file->position = file->real_length; + else lseek (file->handle, 0, SEEK_SET); - } return file; } @@ -1095,9 +1156,12 @@ qfile_t *FS_OpenPackedFile (pack_t* pack, int pack_ind) 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)) - PK3_GetTrueFileOffset (pfile, pack); + if (!PK3_GetTrueFileOffset (pfile, pack)) + return NULL; // No Zlib DLL = no compressed files if (!zlib_dll && (pfile->flags & PACKFILE_FLAG_DEFLATED)) @@ -1105,13 +1169,24 @@ qfile_t *FS_OpenPackedFile (pack_t* pack, int pack_ind) Con_Printf("WARNING: can't open the compressed file %s\n" "You need the Zlib DLL to use compressed files\n", pfile->name); - fs_filesize = -1; + return NULL; + } + + // LordHavoc: lseek affects all duplicates of a handle so we do it before + // 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)", + pfile->name, pack->filename, pfile->offset); return NULL; } dup_handle = dup (pack->handle); if (dup_handle < 0) - Sys_Error ("FS_OpenPackedFile: can't dup package's handle (pack: %s)", pack->filename); + { + Con_Printf ("FS_OpenPackedFile: can't dup package's handle (pack: %s)", pack->filename); + return NULL; + } file = Mem_Alloc (fs_mempool, sizeof (*file)); memset (file, 0, sizeof (*file)); @@ -1122,10 +1197,6 @@ qfile_t *FS_OpenPackedFile (pack_t* pack, int pack_ind) file->position = 0; file->ungetc = EOF; - if (lseek (file->handle, file->offset, SEEK_SET) == -1) - Sys_Error ("FS_OpenPackedFile: can't lseek to %s in %s (offset: %d)", - pfile->name, pack->filename, file->offset); - if (pfile->flags & PACKFILE_FLAG_DEFLATED) { ztoolkit_t *ztk; @@ -1151,7 +1222,12 @@ qfile_t *FS_OpenPackedFile (pack_t* pack, int pack_ind) * size of both compressed and uncompressed data */ if (qz_inflateInit2 (&ztk->zstream, -MAX_WBITS) != Z_OK) - Sys_Error ("FS_OpenPackedFile: inflate init error (file: %s)", pfile->name); + { + Con_Printf ("FS_OpenPackedFile: inflate init error (file: %s)", pfile->name); + close(dup_handle); + Mem_Free(file); + return NULL; + } ztk->zstream.next_out = file->buff; ztk->zstream.avail_out = sizeof (file->buff); @@ -1265,7 +1341,7 @@ static searchpath_t *FS_FindFile (const char *name, int* index, qboolean quiet) else { char netpath[MAX_OSPATH]; - dpsnprintf(netpath, sizeof(netpath), "%s/%s", search->filename, name); + dpsnprintf(netpath, sizeof(netpath), "%s%s", search->filename, name); if (FS_SysFileExists (netpath)) { if (!quiet) @@ -1306,7 +1382,7 @@ qfile_t *FS_OpenReadFile (const char *filename, qboolean quiet, qboolean nonbloc // Not found? if (search == NULL) { - fs_filesize = -1; + fs_filesize = 0; return NULL; } @@ -1314,7 +1390,7 @@ qfile_t *FS_OpenReadFile (const char *filename, qboolean quiet, qboolean nonbloc if (pack_ind < 0) { char path [MAX_OSPATH]; - dpsnprintf (path, sizeof (path), "%s/%s", search->filename, filename); + dpsnprintf (path, sizeof (path), "%s%s", search->filename, filename); return FS_SysOpen (path, "rb", nonblocking); } @@ -1354,7 +1430,7 @@ qfile_t* FS_Open (const char* filepath, const char* mode, qboolean quiet, qboole 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); @@ -1401,9 +1477,23 @@ FS_Write 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 = write (file->handle, data, datasize); + fs_offset_t result; + + // If necessary, seek to the exact file position we're supposed to be + if (file->buff_ind != file->buff_len) + lseek (file->handle, (fs_offset_t)(file->buff_ind - file->buff_len), SEEK_CUR); + + // Purge cached data + FS_Purge (file); + + // Write the buffer and update the position + 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 (result < 0) return 0; @@ -1418,16 +1508,30 @@ FS_Read 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; + + // Get rid of the ungetc character + if (file->ungetc != EOF) + { + ((char*)buffer)[0] = file->ungetc; + buffersize--; + file->ungetc = EOF; + done = 1; + } + else + done = 0; // First, we copy as many bytes as we can from "buff" if (file->buff_ind < file->buff_len) { - count = file->buff_len - file->buff_ind; + count = (fs_offset_t)(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; @@ -1435,8 +1539,6 @@ size_t FS_Read (qfile_t* file, void* buffer, size_t buffersize) if (buffersize == 0) return done; } - else - done = 0; // NOTE: at this point, the read buffer is always empty @@ -1451,8 +1553,8 @@ size_t FS_Read (qfile_t* file, void* buffer, size_t buffersize) // 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); if (nb > 0) @@ -1460,15 +1562,14 @@ size_t FS_Read (qfile_t* file, void* buffer, size_t buffersize) done += nb; file->position += nb; - // Invalidate the output data (for FS_Seek) - file->buff_len = 0; - file->buff_ind = 0; + // Purge cached data + FS_Purge (file); } } 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) @@ -1477,7 +1578,7 @@ size_t FS_Read (qfile_t* file, void* buffer, size_t buffersize) file->position += nb; // Copy the requested data in "buffer" (as much as we can) - count = (buffersize > file->buff_len) ? file->buff_len : buffersize; + count = (fs_offset_t)((buffersize > file->buff_len) ? file->buff_len : buffersize); memcpy (&((qbyte*)buffer)[done], file->buff, count); file->buff_ind = count; done += count; @@ -1503,12 +1604,15 @@ size_t FS_Read (qfile_t* file, void* buffer, size_t buffersize) 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) - Sys_Error ("FS_Read: unexpected end of file"); + 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"); + break; + } ztk->in_ind = 0; ztk->in_len = count; @@ -1516,7 +1620,7 @@ size_t FS_Read (qfile_t* file, void* buffer, size_t buffersize) } ztk->zstream.next_in = &ztk->input[ztk->in_ind]; - ztk->zstream.avail_in = ztk->in_len - ztk->in_ind; + ztk->zstream.avail_in = (unsigned int)(ztk->in_len - ztk->in_ind); // Now that we are sure we have compressed data available, we need to determine // if it's better to inflate it in "file->buff" or directly in "buffer" @@ -1528,14 +1632,17 @@ size_t FS_Read (qfile_t* file, void* buffer, size_t buffersize) ztk->zstream.avail_out = sizeof (file->buff); error = qz_inflate (&ztk->zstream, Z_SYNC_FLUSH); if (error != Z_OK && error != Z_STREAM_END) - Sys_Error ("Can't inflate file"); + { + Con_Printf ("FS_Read: Can't inflate file"); + break; + } ztk->in_ind = ztk->in_len - ztk->zstream.avail_in; file->buff_len = sizeof (file->buff) - ztk->zstream.avail_out; - file->position += file->buff_len; + file->position += (fs_offset_t)file->buff_len; // Copy the requested data in "buffer" (as much as we can) - count = (buffersize > file->buff_len) ? file->buff_len : buffersize; + count = (fs_offset_t)((buffersize > file->buff_len) ? file->buff_len : buffersize); memcpy (&((qbyte*)buffer)[done], file->buff, count); file->buff_ind = count; } @@ -1544,19 +1651,21 @@ size_t FS_Read (qfile_t* file, void* buffer, size_t buffersize) else { ztk->zstream.next_out = &((qbyte*)buffer)[done]; - ztk->zstream.avail_out = buffersize; + ztk->zstream.avail_out = (unsigned int)buffersize; error = qz_inflate (&ztk->zstream, Z_SYNC_FLUSH); if (error != Z_OK && error != Z_STREAM_END) - Sys_Error ("Can't inflate file"); + { + Con_Printf ("FS_Read: Can't inflate file"); + 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; - // Invalidate the output data (for FS_Seek) - file->buff_len = 0; - file->buff_ind = 0; + // Purge cached data + FS_Purge (file); } done += count; @@ -1576,7 +1685,7 @@ Print a string into a file */ int FS_Print (qfile_t* file, const char *msg) { - return FS_Write (file, msg, strlen (msg)); + return (int)FS_Write (file, msg, strlen (msg)); } /* @@ -1609,7 +1718,7 @@ Print a string into a file int FS_VPrintf (qfile_t* file, const char* format, va_list ap) { int len; - size_t buff_size; + fs_offset_t buff_size; char *tempbuff = NULL; buff_size = 1024; @@ -1634,19 +1743,14 @@ int FS_VPrintf (qfile_t* file, const char* format, va_list ap) ==================== FS_Getc -Get stored ungetc character or the next character of a file +Get the next character of a file ==================== */ int FS_Getc (qfile_t* file) { char c; - if (file->ungetc != EOF) - { - c = file->ungetc; - file->ungetc = EOF; - } - else if (FS_Read (file, &c, 1) != 1) + if (FS_Read (file, &c, 1) != 1) return EOF; return c; @@ -1657,12 +1761,17 @@ int FS_Getc (qfile_t* file) ==================== FS_UnGetc -Put a character back into the Getc buffer (only supports one character!) +Put a character back into the read buffer (only supports one character!) ==================== */ -void FS_UnGetc (qfile_t* file, unsigned char c) +int FS_UnGetc (qfile_t* file, unsigned char c) { + // If there's already a character waiting to be read + if (file->ungetc != EOF) + return EOF; + file->ungetc = c; + return c; } @@ -1673,29 +1782,24 @@ FS_Seek 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; - - // if this is an uncompressed real file we can just call the kernel seek - // (necessary when writing files) - if (file->offset == 0 && ! (file->flags & QFILE_FLAG_DEFLATED)) - return lseek (file->handle, offset, whence); + fs_offset_t buffersize; // Compute the file offset switch (whence) { case SEEK_CUR: - offset += file->position - file->buff_len + file->buff_ind; + offset += (long)(file->position - file->buff_len + file->buff_ind); break; case SEEK_SET: break; case SEEK_END: - offset += file->real_length; + offset += (long)file->real_length; break; default: @@ -1705,16 +1809,15 @@ int FS_Seek (qfile_t* file, long offset, int whence) 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 - (fs_offset_t)file->buff_len <= offset + && offset <= file->position) { file->buff_ind = offset + file->buff_len - file->position; return 0; } - // Invalidate the read buffer contents - file->buff_ind = 0; - file->buff_len = 0; + // Purge cached data + FS_Purge (file); // Unpacked or uncompressed files can seek directly if (! (file->flags & QFILE_FLAG_DEFLATED)) @@ -1730,7 +1833,7 @@ int FS_Seek (qfile_t* file, long offset, int whence) 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; @@ -1749,10 +1852,10 @@ int FS_Seek (qfile_t* file, long offset, int whence) buffer = 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); @@ -1775,14 +1878,24 @@ FS_Tell Give the current position in a file ==================== */ -long FS_Tell (qfile_t* file) +fs_offset_t FS_Tell (qfile_t* file) { - // if this is an uncompressed real file we can just call the kernel tell - // (necessary when writing files) - if (file->offset == 0 && ! (file->flags & QFILE_FLAG_DEFLATED)) - return lseek (file->handle, 0, SEEK_CUR); - else - return file->position - file->buff_len + file->buff_ind; + return file->position - (fs_offset_t)(file->buff_len + file->buff_ind); +} + + +/* +==================== +FS_Purge + +Erases any buffered input or output data +==================== +*/ +void FS_Purge (qfile_t* file) +{ + file->buff_len = 0; + file->buff_ind = 0; + file->ungetc = EOF; } @@ -1820,7 +1933,7 @@ FS_WriteFile The filename will be prefixed by the current game directory ============ */ -qboolean FS_WriteFile (const char *filename, void *data, int len) +qboolean FS_WriteFile (const char *filename, void *data, fs_offset_t len) { qfile_t *file; @@ -1968,10 +2081,14 @@ fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet) char netpath[MAX_OSPATH]; char temp[MAX_OSPATH]; - while(!strncmp(pattern, "./", 2)) - pattern += 2; - while(!strncmp(pattern, ".\\", 2)) - pattern += 2; + for (i = 0;pattern[i] == '.' || pattern[i] == ':' || pattern[i] == '/' || pattern[i] == '\\';i++) + ; + + if (i > 0) + { + Con_Printf("Don't use punctuation at the beginning of a search pattern!\n"); + return NULL; + } search = NULL; liststart = NULL; @@ -1980,14 +2097,9 @@ fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet) 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; + separator = max(slash, backslash); + separator = max(separator, colon); + basepathlength = separator ? (separator + 1 - pattern) : 0; basepath = Mem_Alloc (tempmempool, basepathlength + 1); if (basepathlength) memcpy(basepath, pattern, basepathlength); @@ -2039,12 +2151,12 @@ fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet) else { // get a directory listing and look at each name - dpsnprintf(netpath, sizeof (netpath), "%s/%s", searchpath->filename, basepath); + dpsnprintf(netpath, sizeof (netpath), "%s%s", searchpath->filename, basepath); if ((dir = listdirectory(netpath))) { for (dirfile = dir;dirfile;dirfile = dirfile->next) { - dpsnprintf(temp, sizeof(temp), "%s/%s", basepath, dirfile->text); + dpsnprintf(temp, sizeof(temp), "%s%s", basepath, dirfile->text); if (matchpattern(temp, (char *)pattern, true)) { for (listtemp = liststart;listtemp;listtemp = listtemp->next) @@ -2073,12 +2185,12 @@ fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet) 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->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) @@ -2086,7 +2198,7 @@ fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet) 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); @@ -2127,7 +2239,7 @@ int FS_ListDirectory(const char *pattern, int oneperline) columnwidth = 0; for (i = 0;i < numfiles;i++) { - l = strlen(search->filenames[i]); + l = (int)strlen(search->filenames[i]); if (columnwidth < l) columnwidth = l; } @@ -2148,11 +2260,11 @@ int FS_ListDirectory(const char *pattern, int oneperline) if (l < numfiles) { name = search->filenames[l]; - for (j = 0;name[j] && j < (int)sizeof(linebuf) - 1;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 < (numcolumns - 1) && l < (numfiles - 1)) - for (;j < columnwidth && j < (int)sizeof(linebuf) - 1;j++) + if (k + 1 < numcolumns && l + 1 < numfiles) + for (;j < columnwidth && linebufpos + 1 < (int)sizeof(linebuf);j++) linebuf[linebufpos++] = ' '; } } @@ -2167,7 +2279,7 @@ int FS_ListDirectory(const char *pattern, int oneperline) 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)