changed FS_ChangeGamedir to FS_ChangeGameDirs and made it fail if any of the gamedirs...

FS_Init now checks if game directories are found and does a Sys_Error if not
now does a Host_Error if a QW server specifies an invalid gamedir (missing gamedir is ok however, because QW downloads files)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6719 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_parse.c b/cl_parse.c
index dd88bcc5a4fd17f497ad4396e722b55dff282543..1bd43db5c25a761baf751c0c8c112974f506e4f7 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -1068,7 +1068,6 @@ void CL_BeginDownloads_f(void)
        CL_BeginDownloads(false);
 }
 
-extern void FS_Rescan_f(void);
 void CL_StopDownload(int size, int crc)
 {
        if (cls.qw_downloadmemory && cls.qw_downloadmemorycursize == size && CRC_Block(cls.qw_downloadmemory, size) == crc)
@@ -1086,7 +1085,7 @@ void CL_StopDownload(int size, int crc)
 
                        extension = FS_FileExtension(cls.qw_downloadname);
                        if (!strcasecmp(extension, "pak") || !strcasecmp(extension, "pk3"))
-                               FS_Rescan_f();
+                               FS_Rescan();
                }
        }
 
@@ -1306,13 +1305,17 @@ void CL_ParseServerInfo (void)
 
        if (protocol == PROTOCOL_QUAKEWORLD)
        {
+               char gamedir[1][MAX_QPATH];
+
                cl.qw_servercount = MSG_ReadLong();
 
                str = MSG_ReadString();
                Con_Printf("server gamedir is %s\n", str);
+               strlcpy(gamedir[0], str, sizeof(gamedir[0]));
 
                // change gamedir if needed
-               FS_ChangeGameDir(str);
+               if (!FS_ChangeGameDirs(1, gamedir, true, false))
+                       Host_Error("CL_ParseServerInfo: unable to switch to server specified gamedir");
 
                cl.gametype = GAME_DEATHMATCH;
                cl.maxclients = 32;

diff --git a/fs.c b/fs.c
index 016255ef5d6e1474b14b9040f4cd4b1aa2c5837b..d11ea28eacf5db40d8dbd74fcc95a6a1f6d592e0 100644 (file)
--- a/fs.c
+++ b/fs.c
@@ -979,7 +979,7 @@ void FS_AddGameDirectory (const char *dir)
                }
        }
 
-       // add any PK3 package in the director
+       // add any PK3 package in the directory
        for (current = list;current;current = current->next)
        {
                if (!strcasecmp(FS_FileExtension(current->text), "pk3"))
@@ -988,6 +988,7 @@ void FS_AddGameDirectory (const char *dir)
                        FS_AddPack_Fullpath(pakfile, NULL, false);
                }
        }
+
        freedirectory(list);
 
        // Add the directory to the search path
@@ -1091,10 +1092,10 @@ void FS_ClearSearchPath (void)
 
 /*
 ================
-FS_Rescan_f
+FS_Rescan
 ================
 */
-void FS_Rescan_f (void)
+void FS_Rescan (void)
 {
        int i;
        qboolean fs_modified = false;
@@ -1154,36 +1155,74 @@ void FS_Rescan_f (void)
        }
 }
 
+void FS_Rescan_f(void)
+{
+       FS_Rescan();
+}
 
 /*
 ================
-FS_ChangeGameDir
+FS_ChangeGameDirs
 ================
 */
-void Host_SaveConfig_f (void);
-void Host_LoadConfig_f (void);
-qboolean FS_ChangeGameDir(const char *string)
+extern void Host_SaveConfig_f (void);
+extern void Host_LoadConfig_f (void);
+qboolean FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qboolean complain, qboolean failmissing)
 {
-       // if already using the requested gamedir, do nothing
-       if (fs_numgamedirs == 1 && !strcmp(fs_gamedirs[0], string))
-               return false;
+       int i;
 
-       // if string is nasty, reject it
-       if(FS_CheckNastyPath(string, true)) // overflowed or nasty?
+       if (cls.state != ca_disconnected || sv.active)
        {
-               Con_Printf("FS_ChangeGameDir(\"%s\"): nasty filename rejected\n", string);
+               if (complain)
+                       Con_Printf("Can not change gamedir while client is connected or server is running!\n");
                return false;
        }
 
-       // save the current config
+       if (fs_numgamedirs == numgamedirs)
+       {
+               for (i = 0;i < numgamedirs;i++)
+                       if (strcasecmp(fs_gamedirs[i], gamedirs[i]))
+                               break;
+               if (i == numgamedirs)
+                       return true; // already using this set of gamedirs, do nothing
+       }
+
+       if (numgamedirs > MAX_GAMEDIRS)
+       {
+               if (complain)
+                       Con_Printf("That is too many gamedirs (%i > %i)\n", numgamedirs, MAX_GAMEDIRS);
+               return false; // too many gamedirs
+       }
+
+       for (i = 0;i < numgamedirs;i++)
+       {
+               // if string is nasty, reject it
+               if(FS_CheckNastyPath(gamedirs[i], true))
+               {
+                       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 (complain)
+                               Con_Printf("Gamedir missing: %s%s/\n", fs_basedir, gamedirs[i]);
+                       return false; // missing gamedirs
+               }
+       }
+
        Host_SaveConfig_f();
 
-       // change to the new gamedir
-       fs_numgamedirs = 1;
-       strlcpy(fs_gamedirs[0], string, sizeof(fs_gamedirs[0]));
+       fs_numgamedirs = numgamedirs;
+       for (i = 0;i < fs_numgamedirs;i++)
+               strlcpy(fs_gamedirs[i], gamedirs[i], sizeof(fs_gamedirs[i]));
 
        // reinitialize filesystem to detect the new paks
-       FS_Rescan_f();
+       FS_Rescan();
 
        // exec the new config
        Host_LoadConfig_f();
@@ -1205,6 +1244,8 @@ FS_GameDir_f
 void FS_GameDir_f (void)
 {
        int i;
+       int numgamedirs;
+       char gamedirs[MAX_GAMEDIRS][MAX_QPATH];
 
        if (Cmd_Argc() < 2)
        {
@@ -1215,39 +1256,42 @@ void FS_GameDir_f (void)
                return;
        }
 
-       if (cls.state != ca_disconnected || sv.active)
+       numgamedirs = Cmd_Argc() - 1;
+       if (numgamedirs > MAX_GAMEDIRS)
        {
-               Con_Printf("Can not change gamedir while client is connected or server is running!\n");
+               Con_Printf("Too many gamedirs (%i > %i)\n", numgamedirs, MAX_GAMEDIRS);
                return;
        }
 
-       Host_SaveConfig_f();
+       for (i = 0;i < numgamedirs;i++)
+               strlcpy(gamedirs[i], Cmd_Argv(i+1), sizeof(gamedirs[i]));
 
-       fs_numgamedirs = 0;
-       for (i = 1;i < Cmd_Argc() && fs_numgamedirs < MAX_GAMEDIRS;i++)
-       {
-               // if string is nasty, reject it
-               if(FS_CheckNastyPath(Cmd_Argv(i), true)) // overflowed or nasty?
-               {
-                       Con_Printf("FS_GameDir_f(\"%s\"): nasty filename rejected\n", Cmd_Argv(i));
-                       continue;
-               }
+       // allow gamedir change during demo loop
+       if (cls.demoplayback)
+               CL_Disconnect();
 
-               strlcpy(fs_gamedirs[fs_numgamedirs], Cmd_Argv(i), sizeof(fs_gamedirs[fs_numgamedirs]));
-               fs_numgamedirs++;
+       if (cls.state != ca_disconnected || 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");
+               return;
        }
 
-       // reinitialize filesystem to detect the new paks
-       FS_Rescan_f();
-
-       // exec the new config
-       Host_LoadConfig_f();
+       FS_ChangeGameDirs(numgamedirs, gamedirs, true, true);
+}
 
-       // reinitialize the loaded sounds
-       S_Reload_f();
 
-       // reinitialize renderer (this reloads hud/console background/etc)
-       R_Modules_Restart();
+/*
+================
+FS_CheckGameDir
+================
+*/
+qboolean FS_CheckGameDir(const char *gamedir)
+{
+       stringlist_t *list = listdirectory(va("%s%s/", fs_basedir, gamedir));
+       if (list)
+               freedirectory(list);
+       return list != NULL;
 }
 
 
@@ -1303,6 +1347,12 @@ 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))
+               Sys_Error("base gamedir %s%s/ not found!\n", fs_basedir, gamedirname1);
+
+       if (gamedirname2 && !FS_CheckGameDir(gamedirname2))
+               Sys_Error("base gamedir %s%s/ not found!\n", fs_basedir, gamedirname2);
+
        // -game <gamedir>
        // Adds basedir/gamedir as an override game
        // LordHavoc: now supports multiple -game directories
@@ -1313,14 +1363,18 @@ 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]))
+                               Sys_Error("-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]));
                        fs_numgamedirs++;
                }
        }
 
-       // update the searchpath
-       FS_Rescan_f();
+       // generate the searchpath
+       FS_Rescan();
 }
 
 void FS_Init_Commands(void)

diff --git a/fs.h b/fs.h
index d1c87d3cde4cd4c66faff3a05cfa2485401c67a0..8d2f4069570c47e7c3817371bdec36d59f1cf473 100644 (file)
--- a/fs.h
+++ b/fs.h
@@ -69,8 +69,10 @@ void FS_Purge (qfile_t* file);
 const char *FS_FileWithoutPath (const char *in);
 const char *FS_FileExtension (const char *in);
 int FS_CheckNastyPath (const char *path, qboolean isgamedir);
-qboolean FS_ChangeGameDir(const char *string);
+qboolean FS_CheckGameDir(const char *gamedir);
+qboolean FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qboolean complain, qboolean failmissing);
 qboolean FS_IsRegisteredQuakePack(const char *name);
+void FS_Rescan(void);
 
 typedef struct fssearch_s
 {