X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=fs.c;h=ad8066859b4a02eb8691ef699eac3a5c00ee60c8;hb=1c83503f63868a30f2090ce88e0bc0d76dd6dc16;hp=0c6901b3823836002769d861e6bab239c75a3bc2;hpb=bff3b37695781143ae115f609ae69603ddd73a7e;p=xonotic%2Fdarkplaces.git diff --git a/fs.c b/fs.c index 0c6901b3..ad806685 100644 --- a/fs.c +++ b/fs.c @@ -22,9 +22,6 @@ Boston, MA 02111-1307, USA */ -// on UNIX platforms we need to define this so that video saving does not cause a SIGFSZ (file size) signal when a video clip exceeds 2GB -#define _FILE_OFFSET_BITS 64 - #include "quakedef.h" #include @@ -33,6 +30,7 @@ #ifdef WIN32 # include # include +# include #else # include # include @@ -40,6 +38,7 @@ #endif #include "fs.h" +#include "wad.h" // Win32 requires us to add O_BINARY, but the other OSes don't have it #ifndef O_BINARY @@ -51,6 +50,10 @@ # define O_NONBLOCK 0 #endif +// largefile support for Win32 +#ifdef WIN32 +# define lseek _lseeki64 +#endif /* @@ -273,11 +276,11 @@ char fs_gamedir[MAX_OSPATH]; char fs_basedir[MAX_OSPATH]; // list of active game directories (empty if not running a mod) -#define MAX_GAMEDIRS 16 int fs_numgamedirs = 0; char fs_gamedirs[MAX_GAMEDIRS][MAX_QPATH]; 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)"}; +cvar_t fs_empty_files_in_pack_mark_deletions = {0, "fs_empty_files_in_pack_mark_deletions", "0", "if enabled, empty files in a pak/pk3 count as not existing but cancel the search in further packs, effectively allowing patch pak/pk3 files to 'delete' files"}; /* @@ -363,14 +366,7 @@ qboolean PK3_OpenLibrary (void) return true; // Load the DLL - if (! Sys_LoadLibrary (dllnames, &zlib_dll, zlibfuncs)) - { - Con_Printf ("Compressed files support disabled\n"); - return false; - } - - Con_Printf ("Compressed files support enabled\n"); - return true; + return Sys_LoadLibrary (dllnames, &zlib_dll, zlibfuncs); } @@ -964,12 +960,11 @@ void FS_AddGameDirectory (const char *dir) int i; stringlist_t list; searchpath_t *search; - char pakfile[MAX_OSPATH]; strlcpy (fs_gamedir, dir, sizeof (fs_gamedir)); stringlistinit(&list); - listdirectory(&list, dir); + listdirectory(&list, "", dir); stringlistsort(&list); // add any PAK package in the directory @@ -977,8 +972,7 @@ void FS_AddGameDirectory (const char *dir) { if (!strcasecmp(FS_FileExtension(list.strings[i]), "pak")) { - dpsnprintf (pakfile, sizeof (pakfile), "%s%s", dir, list.strings[i]); - FS_AddPack_Fullpath(pakfile, NULL, false); + FS_AddPack_Fullpath(list.strings[i], NULL, false); } } @@ -987,8 +981,7 @@ void FS_AddGameDirectory (const char *dir) { if (!strcasecmp(FS_FileExtension(list.strings[i]), "pk3")) { - dpsnprintf (pakfile, sizeof (pakfile), "%s%s", dir, list.strings[i]); - FS_AddPack_Fullpath(pakfile, NULL, false); + FS_AddPack_Fullpath(list.strings[i], NULL, false); } } @@ -1010,19 +1003,50 @@ FS_AddGameHierarchy */ void FS_AddGameHierarchy (const char *dir) { -#ifndef WIN32 + int i; + char userdir[MAX_QPATH]; +#ifdef WIN32 + TCHAR mydocsdir[MAX_PATH + 1]; +#else const char *homedir; #endif // Add the common game directory FS_AddGameDirectory (va("%s%s/", fs_basedir, dir)); -#ifndef WIN32 + *userdir = 0; + // Add the personal game directory +#ifdef WIN32 + if(SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, 0, mydocsdir) == S_OK) + dpsnprintf(userdir, sizeof(userdir), "%s/My Games/%s/", mydocsdir, gameuserdirname); + fprintf(stderr, "userdir = %s\n", userdir); +#else homedir = getenv ("HOME"); - if (homedir != NULL && homedir[0] != '\0') - FS_AddGameDirectory (va("%s/.%s/%s/", homedir, gameuserdirname, dir)); + if(homedir) + dpsnprintf(userdir, sizeof(userdir), "%s/.%s/", homedir, gameuserdirname); +#endif + +#ifdef WIN32 + if(!COM_CheckParm("-mygames")) + { + int fd = open (va("%s%s/config.cfg", fs_basedir, dir), O_WRONLY | O_CREAT, 0666); // note: no O_TRUNC here! + if(fd >= 0) + { + close(fd); + *userdir = 0; // we have write access to the game dir, so let's use it + } + } #endif + + if(COM_CheckParm("-nohome")) + *userdir = 0; + + if((i = COM_CheckParm("-userdir")) && i < com_argc - 1) + dpsnprintf(userdir, sizeof(userdir), "%s/", com_argv[i+1]); + + if (*userdir) + FS_AddGameDirectory(va("%s%s/", userdir, dir)); } @@ -1078,12 +1102,18 @@ FS_ClearSearchPath */ void FS_ClearSearchPath (void) { + // unload all packs and directory information, close all pack files + // (if a qfile is still reading a pack it won't be harmed because it used + // dup() to get its own handle already) while (fs_searchpaths) { searchpath_t *search = fs_searchpaths; fs_searchpaths = search->next; if (search->pack) { + // close the file + close(search->pack->handle); + // free any memory associated with it if (search->pack->files) Mem_Free(search->pack->files); Mem_Free(search->pack); @@ -1156,6 +1186,9 @@ void FS_Rescan (void) if (gamemode == GAME_NORMAL || gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE) Con_Print("Playing registered version.\n"); } + + // unload all wads so that future queries will return the new data + W_UnloadAll(); } void FS_Rescan_f(void) @@ -1168,7 +1201,7 @@ void FS_Rescan_f(void) FS_ChangeGameDirs ================ */ -extern void Host_SaveConfig_f (void); +extern void Host_SaveConfig (void); extern void Host_LoadConfig_f (void); qboolean FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qboolean complain, qboolean failmissing) { @@ -1211,7 +1244,10 @@ qboolean FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qboolean } } - Host_SaveConfig_f(); + // halt demo playback to close the file + CL_Disconnect(); + + Host_SaveConfig(); fs_numgamedirs = numgamedirs; for (i = 0;i < fs_numgamedirs;i++) @@ -1223,8 +1259,8 @@ qboolean FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qboolean // exec the new config Host_LoadConfig_f(); - // reinitialize the loaded sounds - S_Reload_f(); + // unload all sounds so they will be reloaded from the new files as needed + S_UnloadAllSounds_f(); // reinitialize renderer (this reloads hud/console background/etc) R_Modules_Restart(); @@ -1262,11 +1298,7 @@ void FS_GameDir_f (void) for (i = 0;i < numgamedirs;i++) strlcpy(gamedirs[i], Cmd_Argv(i+1), sizeof(gamedirs[i])); - // allow gamedir change during demo loop - if (cls.demoplayback) - CL_Disconnect(); - - if (cls.state == ca_connected || sv.active) + if ((cls.state == ca_connected && !cls.demoplayback) || sv.active) { // actually, changing during game would work fine, but would be stupid Con_Printf("Can not change gamedir while client is connected or server is running!\n"); @@ -1287,7 +1319,7 @@ qboolean FS_CheckGameDir(const char *gamedir) qboolean success; stringlist_t list; stringlistinit(&list); - listdirectory(&list, va("%s%s/", fs_basedir, gamedir)); + listdirectory(&list, va("%s%s/", fs_basedir, gamedir), ""); success = list.numstrings > 0; stringlistfreecontents(&list); return success; @@ -1379,6 +1411,7 @@ void FS_Init (void) void FS_Init_Commands(void) { Cvar_RegisterVariable (&scr_screenshot_name); + Cvar_RegisterVariable (&fs_empty_files_in_pack_mark_deletions); Cmd_AddCommand ("gamedir", FS_GameDir_f, "changes active gamedir list (can take multiple arguments), not including base directory (example usage: gamedir ctf)"); Cmd_AddCommand ("fs_rescan", FS_Rescan_f, "rescans filesystem for new pack archives and any other changes"); @@ -1394,6 +1427,10 @@ FS_Shutdown */ void FS_Shutdown (void) { + // close all pack files and such + // (hopefully there aren't any other open files, but they'll be cleaned up + // by the OS anyway) + FS_ClearSearchPath(); Mem_FreePool (&fs_mempool); } @@ -1672,6 +1709,17 @@ static searchpath_t *FS_FindFile (const char *name, int* index, qboolean quiet) // Found it if (!diff) { + if (fs_empty_files_in_pack_mark_deletions.integer && pak->files[middle].realsize == 0) + { + // yes, but the first one is empty so we treat it as not being there + if (!quiet && developer.integer >= 10) + Con_Printf("FS_FindFile: %s is marked as deleted\n", name); + + if (index != NULL) + *index = -1; + return NULL; + } + if (!quiet && developer.integer >= 10) Con_Printf("FS_FindFile: %s in %s\n", pak->files[middle].name, pak->filename); @@ -1761,6 +1809,17 @@ Open a file. The syntax is the same as fopen */ qfile_t* FS_Open (const char* filepath, const char* mode, qboolean quiet, qboolean nonblocking) { +#ifdef FS_FIX_PATHS + char fixedFileName[MAX_QPATH]; + char *d; + strlcpy( fixedFileName, filepath, MAX_QPATH ); + // try to fix common mistakes (\ instead of /) + for( d = fixedFileName ; *d ; d++ ) + if( *d == '\\' ) + *d = '/'; + filepath = fixedFileName; +#endif + if (FS_CheckNastyPath(filepath, false)) { Con_Printf("FS_Open(\"%s\", \"%s\", %s): nasty filename rejected\n", filepath, mode, quiet ? "true" : "false"); @@ -1869,12 +1928,12 @@ fs_offset_t FS_Read (qfile_t* file, void* buffer, size_t buffersize) if (file->buff_ind < file->buff_len) { count = file->buff_len - file->buff_ind; + count = ((fs_offset_t)buffersize > count) ? count : (fs_offset_t)buffersize; + done += count; + memcpy (buffer, &file->buff[file->buff_ind], count); + file->buff_ind += count; - done += ((fs_offset_t)buffersize > count) ? count : (fs_offset_t)buffersize; - memcpy (buffer, &file->buff[file->buff_ind], done); - file->buff_ind += done; - - buffersize -= done; + buffersize -= count; if (buffersize == 0) return done; } @@ -2086,7 +2145,7 @@ Get the next character of a file */ int FS_Getc (qfile_t* file) { - char c; + unsigned char c; if (FS_Read (file, &c, 1) != 1) return EOF; @@ -2143,7 +2202,7 @@ int FS_Seek (qfile_t* file, fs_offset_t offset, int whence) default: return -1; } - if (offset < 0 || offset > (long) file->real_length) + if (offset < 0 || offset > file->real_length) return -1; // If we have the data in our read buffer, we don't need to actually seek @@ -2271,6 +2330,8 @@ unsigned char *FS_LoadFile (const char *path, mempool_t *pool, qboolean quiet, f buf[filesize] = '\0'; FS_Read (file, buf, filesize); FS_Close (file); + if (developer_loadfile.integer) + Con_Printf("loaded file \"%s\" (%u bytes)\n", path, (unsigned int)filesize); } if (filesizepointer) @@ -2297,7 +2358,7 @@ qboolean FS_WriteFile (const char *filename, void *data, fs_offset_t len) return false; } - Con_DPrintf("FS_WriteFile: %s\n", filename); + Con_DPrintf("FS_WriteFile: %s (%u bytes)\n", filename, (unsigned int)len); FS_Write (file, data, len); FS_Close (file); return true; @@ -2366,6 +2427,30 @@ void FS_DefaultExtension (char *path, const char *extension, size_t size_path) } +/* +================== +FS_FileType + +Look for a file in the packages and in the filesystem +================== +*/ +int FS_FileType (const char *filename) +{ + searchpath_t *search; + char fullpath[MAX_QPATH]; + + search = FS_FindFile (filename, NULL, true); + if(!search) + return FS_FILETYPE_NONE; + + if(search->pack) + return FS_FILETYPE_FILE; // TODO can't check directories in paks yet, maybe later + + dpsnprintf(fullpath, sizeof(fullpath), "%s%s", search->filename, filename); + return FS_SysFileType(fullpath); +} + + /* ================== FS_FileExists @@ -2386,28 +2471,36 @@ FS_SysFileExists Look for a file in the filesystem only ================== */ -qboolean FS_SysFileExists (const char *path) +int FS_SysFileType (const char *path) { #if WIN32 - int desc; + DWORD result = GetFileAttributes(path); - // TODO: use another function instead, to avoid opening the file - desc = open (path, O_RDONLY | O_BINARY); - if (desc < 0) - return false; + if(result == INVALID_FILE_ATTRIBUTES) + return FS_FILETYPE_NONE; - close (desc); - return true; + if(result & FILE_ATTRIBUTE_DIRECTORY) + return FS_FILETYPE_DIRECTORY; + + return FS_FILETYPE_FILE; #else struct stat buf; if (stat (path,&buf) == -1) - return false; + return FS_FILETYPE_NONE; - return true; + if(S_ISDIR(buf.st_mode)) + return FS_FILETYPE_DIRECTORY; + + return FS_FILETYPE_FILE; #endif } +qboolean FS_SysFileExists (const char *path) +{ + return FS_SysFileType (path) != FS_FILETYPE_NONE; +} + void FS_mkdir (const char *path) { #if WIN32 @@ -2434,7 +2527,6 @@ fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet) stringlist_t dirlist; const char *slash, *backslash, *colon, *separator; char *basepath; - char netpath[MAX_OSPATH]; char temp[MAX_OSPATH]; for (i = 0;pattern[i] == '.' || pattern[i] == ':' || pattern[i] == '/' || pattern[i] == '\\';i++) @@ -2481,8 +2573,8 @@ fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet) if (resultlistindex == resultlist.numstrings) { stringlistappend(&resultlist, temp); - if (!quiet) - Con_DPrintf("SearchPackFile: %s : %s\n", pak->filename, temp); + if (!quiet && developer_loading.integer) + Con_Printf("SearchPackFile: %s : %s\n", pak->filename, temp); } } // strip off one path element at a time until empty @@ -2503,13 +2595,80 @@ 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); - stringlistinit(&dirlist); - listdirectory(&dirlist, netpath); - for (dirlistindex = 0;dirlistindex < dirlist.numstrings;dirlistindex++) + stringlist_t matchedSet, foundSet; + int resultindex = 0; + const char *start = pattern; + + stringlistinit(&matchedSet); + stringlistinit(&foundSet); + // add a first entry to the set + stringlistappend(&matchedSet, ""); + // iterate through pattern's path + while (*start) + { + const char *asterisk, *wildcard, *nextseparator, *prevseparator; + char subpath[MAX_OSPATH]; + char subpattern[MAX_OSPATH]; + + // find the next wildcard + wildcard = strchr(start, '?'); + asterisk = strchr(start, '*'); + if (asterisk && (!wildcard || asterisk < wildcard)) + { + wildcard = asterisk; + } + + if (wildcard) + { + nextseparator = strchr( wildcard, '/' ); + } + else + { + nextseparator = NULL; + } + + if( !nextseparator ) { + nextseparator = start + strlen( start ); + } + + // copy everything up except nextseperator + strlcpy(subpattern, pattern, min(sizeof(subpattern), nextseparator - pattern + 1)); + // find the last / + prevseparator = strrchr( subpattern, '/' ) + 1; + if (!prevseparator) + { + prevseparator = subpattern; + } + // copy everything including the last '/' + strlcpy(subpath, start, min(sizeof(subpath), (prevseparator - subpattern) - (start - pattern) + 1)); + + // prevseparator points to the one right before the wildcard and nextseparator to the one following it (or past the end of the string (at \0)) + // start to prevseparator can be opened now and added to the other resultset + for( dirlistindex = 0 ; dirlistindex < matchedSet.numstrings ; dirlistindex++ ) { + strlcpy( temp, matchedSet.strings[ dirlistindex ], sizeof(temp) ); + strlcat( temp, subpath, sizeof(temp) ); + listdirectory( &foundSet, searchpath->filename, temp ); + } + if( dirlistindex == 0 ) { + break; + } + // reset the current result set + stringlistfreecontents( &matchedSet ); + // match against the pattern + for( dirlistindex = 0 ; dirlistindex < foundSet.numstrings ; dirlistindex++ ) { + const char *direntry = foundSet.strings[ dirlistindex ]; + if (matchpattern(direntry, subpattern, true)) { + stringlistappend( &matchedSet, direntry ); + } + } + stringlistfreecontents( &foundSet ); + + start = nextseparator; + } + + for (dirlistindex = 0;dirlistindex < matchedSet.numstrings;dirlistindex++) { - dpsnprintf(temp, sizeof(temp), "%s%s", basepath, dirlist.strings[dirlistindex]); + const char *temp = matchedSet.strings[dirlistindex]; if (matchpattern(temp, (char *)pattern, true)) { for (resultlistindex = 0;resultlistindex < resultlist.numstrings;resultlistindex++) @@ -2518,12 +2677,12 @@ fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet) if (resultlistindex == resultlist.numstrings) { stringlistappend(&resultlist, temp); - if (!quiet) - Con_DPrintf("SearchDirFile: %s\n", temp); + if (!quiet && developer_loading.integer) + Con_Printf("SearchDirFile: %s\n", temp); } } } - stringlistfreecontents(&dirlist); + stringlistfreecontents( &matchedSet ); } }