X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=fs.c;h=96479bd8e519c13a00d3f4b768c9385f4f052cbe;hb=f68ef7b22979928fb6b8d2ba6b28e14c4caeb7c2;hp=b5262f636ea30a4a6ae03d181d07cc97df451fa6;hpb=c72641f5e795ed0e0d58a38d79860cc92597e4da;p=xonotic%2Fdarkplaces.git diff --git a/fs.c b/fs.c index b5262f63..96479bd8 100644 --- a/fs.c +++ b/fs.c @@ -305,9 +305,11 @@ VARIABLES mempool_t *fs_mempool; searchpath_t *fs_searchpaths = NULL; +const char *const fs_checkgamedir_missing = "missing"; #define MAX_FILES_IN_PACK 65536 +char fs_userdir[MAX_OSPATH]; char fs_gamedir[MAX_OSPATH]; char fs_basedir[MAX_OSPATH]; @@ -315,8 +317,13 @@ char fs_basedir[MAX_OSPATH]; 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; the date is encoded using strftime escapes)"}; +// list of all gamedirs with modinfo.txt +gamedir_t *fs_all_gamedirs = NULL; +int fs_all_gamedirs_count = 0; + +cvar_t scr_screenshot_name = {CVAR_NORESETTODEFAULTS, "scr_screenshot_name","dp", "prefix name for saved screenshots (changes based on -game commandline, as well as which game mode is running; the date is encoded using strftime escapes)"}; 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"}; +cvar_t cvar_fs_gamedir = {CVAR_READONLY | CVAR_NORESETTODEFAULTS, "fs_gamedir", "", "the list of currently selected gamedirs (use the 'gamedir' command to change this)"}; /* @@ -1031,7 +1038,7 @@ FS_AddPack */ qboolean FS_AddPack(const char *pakfile, qboolean *already_loaded, qboolean keep_plain_dirs) { - char fullpath[MAX_QPATH]; + char fullpath[MAX_OSPATH]; int index; searchpath_t *search; @@ -1108,86 +1115,11 @@ FS_AddGameHierarchy */ void FS_AddGameHierarchy (const char *dir) { - int i; - char userdir[MAX_QPATH]; -#ifdef WIN32 - TCHAR mydocsdir[MAX_PATH + 1]; -#if _MSC_VER >= 1400 - size_t homedirlen; -#endif -#endif - char *homedir; - // Add the common game directory FS_AddGameDirectory (va("%s%s/", fs_basedir, dir)); - *userdir = 0; - - // Add the personal game directory -#ifdef WIN32 - if(qSHGetFolderPath && (qSHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, 0, mydocsdir) == S_OK)) - { - dpsnprintf(userdir, sizeof(userdir), "%s/My Games/%s/", mydocsdir, gameuserdirname); - Con_DPrintf("Obtained personal directory %s from SHGetFolderPath\n", userdir); - } - else - { - // use the environment -#if _MSC_VER >= 1400 - _dupenv_s (&homedir, &homedirlen, "USERPROFILE"); -#else - homedir = getenv("USERPROFILE"); -#endif - - if(homedir) - { - dpsnprintf(userdir, sizeof(userdir), "%s/My Documents/My Games/%s/", homedir, gameuserdirname); -#if _MSC_VER >= 1400 - free(homedir); -#endif - Con_DPrintf("Obtained personal directory %s from environment\n", userdir); - } - else - *userdir = 0; // just to make sure it hasn't been written to by SHGetFolderPath returning failure - } - - if(!*userdir) - Con_DPrintf("Could not obtain home directory; not supporting -mygames\n"); -#else - homedir = getenv ("HOME"); - if(homedir) - dpsnprintf(userdir, sizeof(userdir), "%s/.%s/", homedir, gameuserdirname); - - if(!*userdir) - Con_DPrintf("Could not obtain home directory; assuming -nohome\n"); -#endif - - -#ifdef WIN32 - if(!COM_CheckParm("-mygames")) - { -#if _MSC_VER >= 1400 - int fd; - _sopen_s(&fd, va("%s%s/config.cfg", fs_basedir, dir), O_WRONLY | O_CREAT, _SH_DENYNO, _S_IREAD | _S_IWRITE); // note: no O_TRUNC here! -#else - int fd = open (va("%s%s/config.cfg", fs_basedir, dir), O_WRONLY | O_CREAT, 0666); // note: no O_TRUNC here! -#endif - 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)); + if (*fs_userdir) + FS_AddGameDirectory(va("%s%s/", fs_userdir, dir)); } @@ -1273,6 +1205,7 @@ void FS_Rescan (void) { int i; qboolean fs_modified = false; + char gamedirbuf[MAX_INPUTLINE]; FS_ClearSearchPath(); @@ -1294,13 +1227,19 @@ void FS_Rescan (void) // Adds basedir/gamedir as an override game // LordHavoc: now supports multiple -game directories // set the com_modname (reported in server info) + *gamedirbuf = 0; for (i = 0;i < fs_numgamedirs;i++) { fs_modified = true; FS_AddGameHierarchy (fs_gamedirs[i]); // update the com_modname (used server info) strlcpy (com_modname, fs_gamedirs[i], sizeof (com_modname)); + if(i) + strlcat(gamedirbuf, va(" %s", fs_gamedirs[i]), sizeof(gamedirbuf)); + else + strlcpy(gamedirbuf, fs_gamedirs[i], sizeof(gamedirbuf)); } + Cvar_SetQuick(&cvar_fs_gamedir, gamedirbuf); // so QC or console code can query it // set the default screenshot name to either the mod name or the // gamemode screenshot name @@ -1308,6 +1247,9 @@ void FS_Rescan (void) Cvar_SetQuick (&scr_screenshot_name, com_modname); else Cvar_SetQuick (&scr_screenshot_name, gamescreenshotname); + + if((i = COM_CheckParm("-modname")) && i < com_argc - 1) + strlcpy(com_modname, com_argv[i+1], sizeof(com_modname)); // If "-condebug" is in the command line, remove the previous log file if (COM_CheckParm ("-condebug") != 0) @@ -1347,6 +1289,7 @@ extern void Host_LoadConfig_f (void); qboolean FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qboolean complain, qboolean failmissing) { int i; + const char *p; if (fs_numgamedirs == numgamedirs) { @@ -1367,17 +1310,14 @@ qboolean FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qboolean for (i = 0;i < numgamedirs;i++) { // if string is nasty, reject it - if(FS_CheckNastyPath(gamedirs[i], true)) + p = FS_CheckGameDir(gamedirs[i]); + if(!p) { if (complain) Con_Printf("Nasty gamedir name rejected: %s\n", gamedirs[i]); return false; // nasty gamedirs } - } - - for (i = 0;i < numgamedirs;i++) - { - if (!FS_CheckGameDir(gamedirs[i]) && failmissing) + if(p == fs_checkgamedir_missing && failmissing) { if (complain) Con_Printf("Gamedir missing: %s%s/\n", fs_basedir, gamedirs[i]); @@ -1449,23 +1389,121 @@ void FS_GameDir_f (void) FS_ChangeGameDirs(numgamedirs, gamedirs, true, true); } +static qfile_t* FS_SysOpen (const char* filepath, const char* mode, qboolean nonblocking); +static const char *FS_SysCheckGameDir(const char *gamedir) +{ + static char buf[8192]; + qboolean success; + qfile_t *f; + stringlist_t list; + fs_offset_t n; + + stringlistinit(&list); + listdirectory(&list, gamedir, ""); + success = list.numstrings > 0; + stringlistfreecontents(&list); + + if(success) + { + f = FS_SysOpen(va("%smodinfo.txt", gamedir), "r", false); + if(f) + { + n = FS_Read (f, buf, sizeof(buf) - 1); + if(n >= 0) + buf[n] = 0; + else + *buf = 0; + FS_Close(f); + } + else + *buf = 0; + return buf; + } + + return NULL; +} /* ================ FS_CheckGameDir ================ */ -qboolean FS_CheckGameDir(const char *gamedir) +const char *FS_CheckGameDir(const char *gamedir) { - qboolean success; - stringlist_t list; + const char *ret; + + if (FS_CheckNastyPath(gamedir, true)) + return NULL; + + ret = FS_SysCheckGameDir(va("%s%s/", fs_userdir, gamedir)); + if(ret) + { + if(!*ret) + { + // get description from basedir + ret = FS_SysCheckGameDir(va("%s%s/", fs_basedir, gamedir)); + if(ret) + return ret; + return ""; + } + return ret; + } + + ret = FS_SysCheckGameDir(va("%s%s/", fs_basedir, gamedir)); + if(ret) + return ret; + + return fs_checkgamedir_missing; +} + +static void FS_ListGameDirs(void) +{ + stringlist_t list, list2; + int i, j; + const char *info; + + fs_all_gamedirs_count = 0; + if(fs_all_gamedirs) + Mem_Free(fs_all_gamedirs); + stringlistinit(&list); - listdirectory(&list, va("%s%s/", fs_basedir, gamedir), ""); - success = list.numstrings > 0; + listdirectory(&list, va("%s/", fs_basedir), ""); + listdirectory(&list, va("%s/", fs_userdir), ""); + stringlistsort(&list); + + stringlistinit(&list2); + for(i = 0; i < list.numstrings; ++i) + { + if(i) + if(!strcmp(list.strings[i-1], list.strings[i])) + continue; + info = FS_CheckGameDir(list.strings[i]); + if(!info) + continue; + if(info == fs_checkgamedir_missing) + continue; + if(!*info) + continue; + stringlistappend(&list2, list.strings[i]); + } stringlistfreecontents(&list); - return success; -} + fs_all_gamedirs = (gamedir_t *)Mem_Alloc(fs_mempool, list2.numstrings * sizeof(*fs_all_gamedirs)); + for(i = 0; i < list2.numstrings; ++i) + { + info = FS_CheckGameDir(list2.strings[i]); + // all this cannot happen any more, but better be safe than sorry + if(!info) + continue; + if(info == fs_checkgamedir_missing) + continue; + if(!*info) + continue; + strlcpy(fs_all_gamedirs[fs_all_gamedirs_count].name, list2.strings[i], sizeof(fs_all_gamedirs[j].name)); + strlcpy(fs_all_gamedirs[fs_all_gamedirs_count].description, info, sizeof(fs_all_gamedirs[j].description)); + ++fs_all_gamedirs_count; + } +} /* ================ @@ -1474,7 +1512,15 @@ FS_Init */ void FS_Init (void) { + const char *p; int i; +#ifdef WIN32 + TCHAR mydocsdir[MAX_PATH + 1]; +#if _MSC_VER >= 1400 + size_t homedirlen; +#endif +#endif + char *homedir; #ifdef WIN32 const char* dllnames [] = @@ -1488,13 +1534,78 @@ void FS_Init (void) fs_mempool = Mem_AllocPool("file management", 0, NULL); + // Add the personal game directory + if((i = COM_CheckParm("-userdir")) && i < com_argc - 1) + { + dpsnprintf(fs_userdir, sizeof(fs_userdir), "%s/", com_argv[i+1]); + } + else if(COM_CheckParm("-nohome")) + { + *fs_userdir = 0; + } + else + { +#ifdef WIN32 + if(qSHGetFolderPath && (qSHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, 0, mydocsdir) == S_OK)) + { + dpsnprintf(fs_userdir, sizeof(fs_userdir), "%s/My Games/%s/", mydocsdir, gameuserdirname); + Con_DPrintf("Obtained personal directory %s from SHGetFolderPath\n", fs_userdir); + } + else + { + // use the environment +#if _MSC_VER >= 1400 + _dupenv_s (&homedir, &homedirlen, "USERPROFILE"); +#else + homedir = getenv("USERPROFILE"); +#endif + + if(homedir) + { + dpsnprintf(fs_userdir, sizeof(fs_userdir), "%s/My Documents/My Games/%s/", homedir, gameuserdirname); +#if _MSC_VER >= 1400 + free(homedir); +#endif + Con_DPrintf("Obtained personal directory %s from environment\n", fs_userdir); + } + } + + if(!*fs_userdir) + Con_DPrintf("Could not obtain home directory; not supporting -mygames\n"); +#else + homedir = getenv ("HOME"); + if(homedir) + dpsnprintf(fs_userdir, sizeof(fs_userdir), "%s/.%s/", homedir, gameuserdirname); + + if(!*fs_userdir) + Con_DPrintf("Could not obtain home directory; assuming -nohome\n"); +#endif + +#ifdef WIN32 + if(!COM_CheckParm("-mygames")) + { +#if _MSC_VER >= 1400 + int fd; + _sopen_s(&fd, va("%s%s/config.cfg", fs_basedir, gamedirname1), O_WRONLY | O_CREAT, _SH_DENYNO, _S_IREAD | _S_IWRITE); // note: no O_TRUNC here! +#else + int fd = open (va("%s%s/config.cfg", fs_basedir, gamedirname1), O_WRONLY | O_CREAT, 0666); // note: no O_TRUNC here! +#endif + if(fd >= 0) + { + close(fd); + *fs_userdir = 0; // we have write access to the game dir, so let's use it + } + } +#endif + } + strlcpy(fs_gamedir, "", sizeof(fs_gamedir)); // If the base directory is explicitly defined by the compilation process #ifdef DP_FS_BASEDIR strlcpy(fs_basedir, DP_FS_BASEDIR, sizeof(fs_basedir)); #else - strlcpy(fs_basedir, "", sizeof(fs_basedir)); + *fs_basedir = 0; #ifdef MACOSX // FIXME: is there a better way to find the directory outside the .app? @@ -1529,11 +1640,18 @@ void FS_Init (void) if (fs_basedir[0] && fs_basedir[strlen(fs_basedir) - 1] != '/' && fs_basedir[strlen(fs_basedir) - 1] != '\\') strlcat(fs_basedir, "/", sizeof(fs_basedir)); - if (!FS_CheckGameDir(gamedirname1)) + FS_ListGameDirs(); + + p = FS_CheckGameDir(gamedirname1); + if(!p || p == fs_checkgamedir_missing) Con_Printf("WARNING: base gamedir %s%s/ not found!\n", fs_basedir, gamedirname1); - if (gamedirname2 && !FS_CheckGameDir(gamedirname2)) - Con_Printf("WARNING: base gamedir %s%s/ not found!\n", fs_basedir, gamedirname2); + if(gamedirname2) + { + p = FS_CheckGameDir(gamedirname2); + if(!p || p == fs_checkgamedir_missing) + Con_Printf("WARNING: base gamedir %s%s/ not found!\n", fs_basedir, gamedirname2); + } // -game // Adds basedir/gamedir as an override game @@ -1545,9 +1663,10 @@ void FS_Init (void) if (!strcmp (com_argv[i], "-game") && i < com_argc-1) { i++; - if (FS_CheckNastyPath(com_argv[i], true)) - Sys_Error("-game %s%s/ is a dangerous/non-portable path\n", fs_basedir, com_argv[i]); - if (!FS_CheckGameDir(com_argv[i])) + p = FS_CheckGameDir(com_argv[i]); + if(!p) + Sys_Error("Nasty -game name rejected: %s", com_argv[i]); + if(p == fs_checkgamedir_missing) Con_Printf("WARNING: -game %s%s/ not found!\n", fs_basedir, com_argv[i]); // add the gamedir to the list of active gamedirs strlcpy (fs_gamedirs[fs_numgamedirs], com_argv[i], sizeof(fs_gamedirs[fs_numgamedirs])); @@ -1563,6 +1682,7 @@ void FS_Init_Commands(void) { Cvar_RegisterVariable (&scr_screenshot_name); Cvar_RegisterVariable (&fs_empty_files_in_pack_mark_deletions); + Cvar_RegisterVariable (&cvar_fs_gamedir); 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"); @@ -2721,7 +2841,7 @@ Look for a file in the packages and in the filesystem int FS_FileType (const char *filename) { searchpath_t *search; - char fullpath[MAX_QPATH]; + char fullpath[MAX_OSPATH]; search = FS_FindFile (filename, NULL, true); if(!search) @@ -3217,6 +3337,10 @@ unsigned char *FS_Deflate(const unsigned char *data, size_t size, size_t *deflat unsigned char *out = NULL; unsigned char *tmp; + *deflated_size = 0; + if(!zlib_dll) + return NULL; + memset(&strm, 0, sizeof(strm)); strm.zalloc = Z_NULL; strm.zfree = Z_NULL; @@ -3310,6 +3434,10 @@ unsigned char *FS_Inflate(const unsigned char *data, size_t size, size_t *inflat unsigned int have; sizebuf_t outbuf; + *inflated_size = 0; + if(!zlib_dll) + return NULL; + memset(&outbuf, 0, sizeof(outbuf)); outbuf.data = (unsigned char *) Mem_Alloc(tempmempool, sizeof(tmp)); outbuf.maxsize = sizeof(tmp);