for(j = 0; j < g_numForbiddenDirs; ++j)
{
+ printf("match against %s?\n", g_strForbiddenDirs[j]);
if(!string_compare_nocase_upper(directory, g_strForbiddenDirs[j])
|| (string_length(directory) > string_length(g_strForbiddenDirs[j]) && directory[string_length(directory) - string_length(g_strForbiddenDirs[j]) - 1] == '/' && !string_compare_nocase_upper(directory + string_length(directory) - string_length(g_strForbiddenDirs[j]), g_strForbiddenDirs[j])))
break;
+ printf("not matched\n");
}
if(j < g_numForbiddenDirs)
+ {
+ printf("Directory %s matched by forbidden dirs, removed\n", directory);
return;
+ }
if (g_numDirs == VFS_MAXDIRS)
return;
// Leonardo Zide (leo@lokigames.com)
//
-#include <stdio.h>
-
-#if defined (__linux__) || defined (__APPLE__)
-#include <dirent.h>
-#include <unistd.h>
-#else
-#include <wtypes.h>
-#include <io.h>
-#define R_OK 04
-#define S_ISDIR(mode) (mode & _S_IFDIR)
-#define PATH_MAX 260
-#endif
-
#include <string.h>
#include <stdlib.h>
#include <sys/stat.h>
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;
// =============================================================================
char filename[PATH_MAX];
char *dirlist;
GDir *dir;
+ int j;
+
+ 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++;
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);
{
#ifndef _VFS_H_
#define _VFS_H_
+// to get PATH_MAX
+#include <stdio.h>
+#if defined (__linux__) || defined (__APPLE__)
+#include <dirent.h>
+#include <unistd.h>
+#else
+#include <wtypes.h>
+#include <io.h>
+#define R_OK 04
+#define S_ISDIR(mode) (mode & _S_IFDIR)
+#define PATH_MAX 260
+#endif
+
#define VFS_MAXDIRS 64
void vfsInitDirectory (const char *path);
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_
argv[ i ] = NULL;
}
+ /* -fs_forbiddenpath */
+ else if( strcmp( argv[ i ], "-fs_forbiddenpath" ) == 0 )
+ {
+ if( ++i >= *argc )
+ Error( "Out of arguments: No path specified after %s.", argv[ i - 1 ] );
+ argv[ i - 1 ] = NULL;
+ if(g_numForbiddenDirs < VFS_MAXDIRS)
+ {
+ strncpy(g_strForbiddenDirs[g_numForbiddenDirs], argv[i], PATH_MAX);
+ g_strForbiddenDirs[g_numForbiddenDirs][PATH_MAX] = 0;
+ ++g_numForbiddenDirs;
+ }
+ argv[ i ] = NULL;
+ }
+
/* -fs_basepath */
else if( strcmp( argv[ i ], "-fs_basepath" ) == 0 )
{