BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 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

46
builtin/mainmenu/modmgr.lua
View File

@ -17,30 +17,32 @@
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
function get_mods(path,retval,modpack) function get_mods(path,retval,modpack)
local mods = core.get_dirlist(path, true)
for i=1, #mods, 1 do
if mods[i]:sub(1,1) ~= "." then
local toadd = {}
local modpackfile = nil
local mods = core.get_dirlist(path,true) toadd.name = mods[i]
for i=1,#mods,1 do toadd.path = path .. DIR_DELIM .. mods[i] .. DIR_DELIM
local toadd = {} if modpack ~= nil and
local modpackfile = nil modpack ~= "" then
toadd.modpack = modpack
else
local filename = path .. DIR_DELIM .. mods[i] .. DIR_DELIM .. "modpack.txt"
local error = nil
modpackfile,error = io.open(filename,"r")
end
toadd.name = mods[i] if modpackfile ~= nil then
toadd.path = path .. DIR_DELIM .. mods[i] .. DIR_DELIM modpackfile:close()
if modpack ~= nil and toadd.is_modpack = true
modpack ~= "" then table.insert(retval,toadd)
toadd.modpack = modpack get_mods(path .. DIR_DELIM .. mods[i],retval,mods[i])
else else
local filename = path .. DIR_DELIM .. mods[i] .. DIR_DELIM .. "modpack.txt" table.insert(retval,toadd)
local error = nil end
modpackfile,error = io.open(filename,"r")
end
if modpackfile ~= nil then
modpackfile:close()
toadd.is_modpack = true
table.insert(retval,toadd)
get_mods(path .. DIR_DELIM .. mods[i],retval,mods[i])
else
table.insert(retval,toadd)
end end
end end
end end

10
builtin/mainmenu/tab_texturepacks.lua
View File

@ -31,11 +31,13 @@ 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 retval ~= "" then if v:sub(1,1) ~= "." then
retval = retval .."," if retval ~= "" then
end retval = retval ..","
end
retval = retval .. core.formspec_escape(v) retval = retval .. core.formspec_escape(v)
end
end end
return retval return retval

101
src/filesys.cpp
View File

@ -52,19 +52,17 @@ 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;
} }
//_tprintf (TEXT("Target directory is %s.\n"), pathstring.c_str()); //_tprintf (TEXT("Target directory is %s.\n"), pathstring.c_str());
@ -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,15 +97,14 @@ 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);
goto Cleanup; goto Cleanup;
} }
} }
retval = 0; retval = 0;
Cleanup: Cleanup:
free(DirSpec); free(DirSpec);
@ -242,53 +235,51 @@ std::vector<DirListNode> GetDirListing(std::string pathstring)
{ {
std::vector<DirListNode> listing; std::vector<DirListNode> listing;
DIR *dp; DIR *dp;
struct dirent *dirp; struct dirent *dirp;
if((dp = opendir(pathstring.c_str())) == NULL) { if((dp = opendir(pathstring.c_str())) == NULL) {
//infostream<<"Error("<<errno<<") opening "<<pathstring<<std::endl; //infostream<<"Error("<<errno<<") opening "<<pathstring<<std::endl;
return listing; return listing;
} }
while ((dirp = readdir(dp)) != NULL) { while ((dirp = readdir(dp)) != NULL) {
// 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 == "..")
DirListNode node; continue;
node.name = dirp->d_name;
if(node.name == "." || node.name == "..")
continue;
int isdir = -1; // -1 means unknown DirListNode node;
node.name = dirp->d_name;
/* int isdir = -1; // -1 means unknown
POSIX doesn't define d_type member of struct dirent and
certain filesystems on glibc/Linux will only return
DT_UNKNOWN for the d_type member.
Also we don't know whether symlinks are directories or not. /*
*/ POSIX doesn't define d_type member of struct dirent and
certain filesystems on glibc/Linux will only return
DT_UNKNOWN for the d_type member.
Also we don't know whether symlinks are directories or not.
*/
#ifdef _DIRENT_HAVE_D_TYPE #ifdef _DIRENT_HAVE_D_TYPE
if(dirp->d_type != DT_UNKNOWN && dirp->d_type != DT_LNK) if(dirp->d_type != DT_UNKNOWN && dirp->d_type != DT_LNK)
isdir = (dirp->d_type == DT_DIR); isdir = (dirp->d_type == DT_DIR);
#endif /* _DIRENT_HAVE_D_TYPE */ #endif /* _DIRENT_HAVE_D_TYPE */
/* /*
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; isdir = ((statbuf.st_mode & S_IFDIR) == S_IFDIR);
isdir = ((statbuf.st_mode & S_IFDIR) == S_IFDIR);
}
node.dir = isdir;
listing.push_back(node);
} }
} node.dir = isdir;
closedir(dp); listing.push_back(node);
}
closedir(dp);
return listing; return listing;
} }