Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 10:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ignore .name directories and files

Browse Source 
Signed-off-by: Craig Robbins <kde.psych@gmail.com>
This commit is contained in:
SmallJoker 2014-12-07 11:14:52 +01:00 committed by Craig Robbins
parent c5f6f9f77a
commit 5229a229a6
3 changed files with 76 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/mainmenu/modmgr.lua
View File

@ -17,9 +17,10 @@
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
function get_mods(path,retval,modpack) function get_mods(path,retval,modpack)
local mods = core.get_dirlist(path, true) local mods = core.get_dirlist(path, true)
for i=1, #mods, 1 do for i=1, #mods, 1 do
if mods[i]:sub(1,1) ~= "." then
local toadd = {} local toadd = {}
local modpackfile = nil local modpackfile = nil
@ -44,6 +45,7 @@ function get_mods(path,retval,modpack)
end end
end end
end end
end
--modmanager implementation --modmanager implementation
modmgr = {} modmgr = {}

2
builtin/mainmenu/tab_texturepacks.lua
View File

@ -31,12 +31,14 @@ local function render_texture_pack_list(list)
local retval = "" local retval = ""
for i, v in ipairs(list) do for i, v in ipairs(list) do
if v:sub(1,1) ~= "." then
if retval ~= "" then if retval ~= "" then
retval = retval .."," retval = retval ..","
end end
retval = retval .. core.formspec_escape(v) retval = retval .. core.formspec_escape(v)
end end
end
return retval return retval
end end

29
src/filesys.cpp
View File

@ -52,16 +52,14 @@ std::vector<DirListNode> GetDirListing(std::string pathstring)
DirSpec = (LPTSTR) malloc (BUFSIZE); DirSpec = (LPTSTR) malloc (BUFSIZE);
if( DirSpec == NULL ) if(DirSpec == NULL) {
{
errorstream<<"GetDirListing: Insufficient memory available"<<std::endl; errorstream<<"GetDirListing: Insufficient memory available"<<std::endl;
retval = 1; retval = 1;
goto Cleanup; goto Cleanup;
} }
// Check that the input is not larger than allowed. // Check that the input is not larger than allowed.
if (pathstring.size() > (BUFSIZE - 2)) if (pathstring.size() > (BUFSIZE - 2)) {
{
errorstream<<"GetDirListing: Input directory is too large."<<std::endl; errorstream<<"GetDirListing: Input directory is too large."<<std::endl;
retval = 3; retval = 3;
goto Cleanup; goto Cleanup;
@ -74,13 +72,10 @@ std::vector<DirListNode> GetDirListing(std::string pathstring)
// Find the first file in the directory. // Find the first file in the directory.
hFind = FindFirstFile(DirSpec, &FindFileData); hFind = FindFirstFile(DirSpec, &FindFileData);
if (hFind == INVALID_HANDLE_VALUE) if (hFind == INVALID_HANDLE_VALUE) {
{
retval = (-1); retval = (-1);
goto Cleanup; goto Cleanup;
} } else {
else
{
// NOTE: // NOTE:
// Be very sure to not include '..' in the results, it will // Be very sure to not include '..' in the results, it will
// result in an epic failure when deleting stuff. // result in an epic failure when deleting stuff.
@ -92,8 +87,7 @@ std::vector<DirListNode> GetDirListing(std::string pathstring)
listing.push_back(node); listing.push_back(node);
// List all the other files in the directory. // List all the other files in the directory.
while (FindNextFile(hFind, &FindFileData) != 0) while (FindNextFile(hFind, &FindFileData) != 0) {
{
DirListNode node; DirListNode node;
node.name = FindFileData.cFileName; node.name = FindFileData.cFileName;
node.dir = FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY; node.dir = FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
@ -103,8 +97,7 @@ std::vector<DirListNode> GetDirListing(std::string pathstring)
dwError = GetLastError(); dwError = GetLastError();
FindClose(hFind); FindClose(hFind);
if (dwError != ERROR_NO_MORE_FILES) if (dwError != ERROR_NO_MORE_FILES) {
{
errorstream<<"GetDirListing: FindNextFile error. Error is " errorstream<<"GetDirListing: FindNextFile error. Error is "
<<dwError<<std::endl; <<dwError<<std::endl;
retval = (-1); retval = (-1);
@ -253,11 +246,11 @@ std::vector<DirListNode> GetDirListing(std::string pathstring)
// NOTE: // NOTE:
// Be very sure to not include '..' in the results, it will // Be very sure to not include '..' in the results, it will
// result in an epic failure when deleting stuff. // result in an epic failure when deleting stuff.
if(dirp->d_name[0]!='.'){ if(dirp->d_name == "." || dirp->d_name == "..")
continue;
DirListNode node; DirListNode node;
node.name = dirp->d_name; node.name = dirp->d_name;
if(node.name == "." || node.name == "..")
continue;
int isdir = -1; // -1 means unknown int isdir = -1; // -1 means unknown
@ -277,8 +270,7 @@ std::vector<DirListNode> GetDirListing(std::string pathstring)
Was d_type DT_UNKNOWN, DT_LNK or nonexistent? Was d_type DT_UNKNOWN, DT_LNK or nonexistent?
If so, try stat(). If so, try stat().
*/ */
if(isdir == -1) if(isdir == -1) {
{
struct stat statbuf; struct stat statbuf;
if (stat((pathstring + "/" + node.name).c_str(), &statbuf)) if (stat((pathstring + "/" + node.name).c_str(), &statbuf))
continue; continue;
@ -287,7 +279,6 @@ std::vector<DirListNode> GetDirListing(std::string pathstring)
node.dir = isdir; node.dir = isdir;
listing.push_back(node); listing.push_back(node);
} }
}
closedir(dp); closedir(dp);
return listing; return listing;