FS improvements from NetRadiant: "forbidden" directories, and pk3dirs

diff --git a/tools/quake3/common/cmdlib.c b/tools/quake3/common/cmdlib.c
index 6e4a0520f6dc57c8f69c50ef068dc201d8199cb5..85068de32c654d01bf3d251f6de8de788f95de95 100644 (file)
--- a/tools/quake3/common/cmdlib.c
+++ b/tools/quake3/common/cmdlib.c
@@ -250,9 +250,7 @@ char *ExpandArg (const char *path)
 char *ExpandPath (const char *path)
 {
        static char full[1024];
-       if (!qdir)
-               Error ("ExpandPath called without qdir set");
-       if (path[0] == '/' || path[0] == '\\' || path[1] == ':') {
+       if (!*qdir || path[0] == '/' || path[0] == '\\' || path[1] == ':') {
                strcpy( full, path );
                return full;
        }
@@ -263,8 +261,8 @@ char *ExpandPath (const char *path)
 char *ExpandGamePath (const char *path)
 {
        static char full[1024];
-       if (!qdir)
-               Error ("ExpandGamePath called without qdir set");
+       if (!*gamedir)
+               Error ("ExpandGamePath called without gamedir set");
        if (path[0] == '/' || path[0] == '\\' || path[1] == ':') {
                strcpy( full, path );
                return full;

diff --git a/tools/quake3/common/cmdlib.h b/tools/quake3/common/cmdlib.h
index afb62d921b6cfb43ad91115b00db0a5d4a342fb5..f85be38f00445b21b74dca2d5385febf9400db81 100644 (file)
--- a/tools/quake3/common/cmdlib.h
+++ b/tools/quake3/common/cmdlib.h
@@ -53,7 +53,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 
+#ifdef PATH_MAX
+#define        MAX_OS_PATH             PATH_MAX
+#else
 #define        MAX_OS_PATH             1024
+#endif
 #define MEM_BLOCKSIZE 4096
 
 // the dec offsetof macro doesnt work very well...

diff --git a/tools/quake3/common/vfs.c b/tools/quake3/common/vfs.c
index 4ca2457225bb54b9c75f300b43ce8719cf0b6428..f8cda41cf9d13337a403f62f3fe69f892261fd1a 100644 (file)
--- a/tools/quake3/common/vfs.c
+++ b/tools/quake3/common/vfs.c
@@ -78,8 +78,10 @@ typedef struct
 
 static GSList*  g_unzFiles;
 static GSList*  g_pakFiles;
-static char     g_strDirs[VFS_MAXDIRS][PATH_MAX];
+static char     g_strDirs[VFS_MAXDIRS][PATH_MAX+1];
 static int      g_numDirs;
+char     g_strForbiddenDirs[VFS_MAXDIRS][PATH_MAX+1];
+int      g_numForbiddenDirs = 0;
 static gboolean g_bUsePak = TRUE;
 
 // =============================================================================
@@ -168,13 +170,24 @@ void vfsInitDirectory (const char *path)
   char filename[PATH_MAX];
   char *dirlist;
   GDir *dir;
+  int j;
   
-  if (g_numDirs == (VFS_MAXDIRS-1))
+  for(j = 0; j < g_numForbiddenDirs; ++j)
+  {
+    if(!Q_stricmp(path, g_strForbiddenDirs[j])
+    || (strlen(path) > strlen(g_strForbiddenDirs[j]) && path[strlen(path) - strlen(g_strForbiddenDirs[j]) - 1] == '/' && !Q_stricmp(path + strlen(path) - strlen(g_strForbiddenDirs[j]), g_strForbiddenDirs[j])))
+      break;
+  }
+  if(j < g_numForbiddenDirs)
+    return;
+  
+  if (g_numDirs == VFS_MAXDIRS)
     return;
   
   Sys_Printf ("VFS Init: %s\n", path);
   
-  strcpy (g_strDirs[g_numDirs], path);
+  strncpy (g_strDirs[g_numDirs], path, PATH_MAX);
+  g_strDirs[g_numDirs][PATH_MAX] = 0;
   vfsFixDOSName (g_strDirs[g_numDirs]);
   vfsAddSlash (g_strDirs[g_numDirs]);
   g_numDirs++;
@@ -191,10 +204,25 @@ void vfsInitDirectory (const char *path)
         if(name == NULL)
           break;
 
+        for(j = 0; j < g_numForbiddenDirs; ++j)
+          if(!Q_stricmp(name, g_strForbiddenDirs[j]))
+            break;
+        if(j < g_numForbiddenDirs)
+          continue;
         dirlist = g_strdup(name);
 
         {
           char *ext = strrchr (dirlist, '.');
+         if(ext && !Q_stricmp(ext, ".pk3dir"))
+         {
+           if (g_numDirs == VFS_MAXDIRS)
+             continue;
+           snprintf(g_strDirs[g_numDirs], PATH_MAX, "%s/%s", path, name);
+           g_strDirs[g_numDirs][PATH_MAX] = '\0';
+           vfsFixDOSName (g_strDirs[g_numDirs]);
+           vfsAddSlash (g_strDirs[g_numDirs]);
+           ++g_numDirs;
+         }
           if ((ext == NULL) || (Q_stricmp (ext, ".pk3") != 0))
             continue;
         }

diff --git a/tools/quake3/common/vfs.h b/tools/quake3/common/vfs.h
index 44b3ffad32965aa27ae47eeb578ead8cb2ab726c..dec1170d110978f39199ebc41fa8ead89f42b251 100644 (file)
--- a/tools/quake3/common/vfs.h
+++ b/tools/quake3/common/vfs.h
@@ -31,11 +31,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef _VFS_H_
 #define _VFS_H_
 
-#define VFS_MAXDIRS 8
+#define VFS_MAXDIRS 64
 
 void vfsInitDirectory (const char *path);
 void vfsShutdown ();
 int vfsGetFileCount (const char *filename);
 int vfsLoadFile (const char *filename, void **buffer, int index);
 
+extern char     g_strForbiddenDirs[VFS_MAXDIRS][PATH_MAX+1];
+extern int      g_numForbiddenDirs;
+
 #endif // _VFS_H_