X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=fs.c;h=4b06a4e772ae3a7a15be76687a7d6f7c6ea5091c;hp=186c06aeb1d54ffab2c95389b3d546d320aca3cd;hb=1468c2e8327918ba5dcf33f121f7fa484c8a02a8;hpb=472aac7534ff46bfbc36d547987b6425c6bad01e diff --git a/fs.c b/fs.c index 186c06ae..4b06a4e7 100644 --- a/fs.c +++ b/fs.c @@ -366,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); } @@ -967,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 @@ -980,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); } } @@ -990,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); } } @@ -1016,7 +1006,7 @@ void FS_AddGameHierarchy (const char *dir) int i; char userdir[MAX_QPATH]; #ifdef WIN32 - TCHAR appdata[MAX_PATH + 1]; + TCHAR mydocsdir[MAX_PATH + 1]; #else const char *homedir; #endif @@ -1028,8 +1018,8 @@ void FS_AddGameHierarchy (const char *dir) // Add the personal game directory #ifdef WIN32 - if(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, 0, appdata) == S_OK) - dpsnprintf(userdir, sizeof(userdir), "%s/%s/", appdata, gameuserdirname); + if(SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, 0, mydocsdir) == S_OK) + dpsnprintf(userdir, sizeof(userdir), "%s/My Games/%s/", mydocsdir, gameuserdirname); #else homedir = getenv ("HOME"); if(homedir) @@ -1037,7 +1027,7 @@ void FS_AddGameHierarchy (const char *dir) #endif #ifdef WIN32 - if(!COM_CheckParm("-appdata")) + 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) @@ -1050,7 +1040,7 @@ void FS_AddGameHierarchy (const char *dir) if(COM_CheckParm("-nohome")) *userdir = 0; - + if((i = COM_CheckParm("-userdir")) && i < com_argc - 1) dpsnprintf(userdir, sizeof(userdir), "%s/", com_argv[i+1]); @@ -1253,9 +1243,6 @@ qboolean FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qboolean } } - // halt demo playback to close the file - CL_Disconnect(); - Host_SaveConfig(); fs_numgamedirs = numgamedirs; @@ -1314,6 +1301,9 @@ void FS_GameDir_f (void) return; } + // halt demo playback to close the file + CL_Disconnect(); + FS_ChangeGameDirs(numgamedirs, gamedirs, true, true); } @@ -1328,7 +1318,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; @@ -1388,10 +1378,10 @@ void FS_Init (void) strlcat(fs_basedir, "/", sizeof(fs_basedir)); if (!FS_CheckGameDir(gamedirname1)) - Sys_Error("base gamedir %s%s/ not found!\n", fs_basedir, gamedirname1); + Con_Printf("WARNING: 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); + Con_Printf("WARNING: base gamedir %s%s/ not found!\n", fs_basedir, gamedirname2); // -game // Adds basedir/gamedir as an override game @@ -1406,7 +1396,7 @@ void FS_Init (void) 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]); + 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])); fs_numgamedirs++; @@ -1818,6 +1808,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"); @@ -2328,6 +2329,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) @@ -2354,7 +2357,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; @@ -2423,6 +2426,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 @@ -2443,28 +2470,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 @@ -2491,7 +2526,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++) @@ -2538,8 +2572,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 @@ -2560,13 +2594,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; + 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 ); + } + + // prevseparator points past the '/' right before the wildcard and nextseparator at the one following it (or at the end of the string) + // copy everything up except nextseperator + strlcpy(subpattern, pattern, min(sizeof(subpattern), (size_t) (nextseparator - pattern + 1))); + // find the last '/' before the wildcard + prevseparator = strrchr( subpattern, '/' ); + if (!prevseparator) + prevseparator = subpattern; + else + prevseparator++; + // copy everything from start to the previous including the '/' (before the wildcard) + // everything up to start is already included in the path of matchedSet's entries + strlcpy(subpath, start, min(sizeof(subpath), (size_t) ((prevseparator - subpattern) - (start - pattern) + 1))); + + // for each entry in matchedSet try to open the subdirectories specified in subpath + 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++) @@ -2575,12 +2676,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 ); } }