Skip to content

Commit

Permalink
Ignore .name directories and files
Browse files Browse the repository at this point in the history 
Signed-off-by: Craig Robbins <kde.psych@gmail.com>
  • Loading branch information
@SmallJoker @Zeno-
SmallJoker authored and Zeno- committed Dec 9, 2014
1 parent c5f6f9f commit 5229a22
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 82 deletions.
48 changes: 25 additions & 23 deletions builtin/mainmenu/modmgr.lua
View file
Expand Up @@ -17,30 +17,32 @@

--------------------------------------------------------------------------------
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

toadd.name = mods[i]
toadd.path = path .. DIR_DELIM .. mods[i] .. DIR_DELIM
if modpack ~= nil and
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

local mods = core.get_dirlist(path,true)
for i=1,#mods,1 do
local toadd = {}
local modpackfile = nil

toadd.name = mods[i]
toadd.path = path .. DIR_DELIM .. mods[i] .. DIR_DELIM
if modpack ~= nil and
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

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)
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
Expand Down
10 changes: 6 additions & 4 deletions builtin/mainmenu/tab_texturepacks.lua
View file
Expand Up @@ -31,11 +31,13 @@ local function render_texture_pack_list(list)
local retval = ""

for i, v in ipairs(list) do
if retval ~= "" then
retval = retval ..","
end
if v:sub(1,1) ~= "." then
if retval ~= "" then
retval = retval ..","
end

retval = retval .. core.formspec_escape(v)
retval = retval .. core.formspec_escape(v)
end
end

return retval
Expand Down
101 changes: 46 additions & 55 deletions src/filesys.cpp
View file
Expand Up @@ -52,19 +52,17 @@ std::vector<DirListNode> GetDirListing(std::string pathstring)

DirSpec = (LPTSTR) malloc (BUFSIZE);

if( DirSpec == NULL )
{
errorstream<<"GetDirListing: Insufficient memory available"<<std::endl;
retval = 1;
goto Cleanup;
if(DirSpec == NULL) {
errorstream<<"GetDirListing: Insufficient memory available"<<std::endl;
retval = 1;
goto Cleanup;
}

// Check that the input is not larger than allowed.
if (pathstring.size() > (BUFSIZE - 2))
{
errorstream<<"GetDirListing: Input directory is too large."<<std::endl;
retval = 3;
goto Cleanup;
if (pathstring.size() > (BUFSIZE - 2)) {
errorstream<<"GetDirListing: Input directory is too large."<<std::endl;
retval = 3;
goto Cleanup;
}

//_tprintf (TEXT("Target directory is %s.\n"), pathstring.c_str());
Expand All @@ -74,13 +72,10 @@ std::vector<DirListNode> GetDirListing(std::string pathstring)
// Find the first file in the directory.
hFind = FindFirstFile(DirSpec, &FindFileData);

if (hFind == INVALID_HANDLE_VALUE)
{
if (hFind == INVALID_HANDLE_VALUE) {
retval = (-1);
goto Cleanup;
}
else
{
} else {
// NOTE:
// Be very sure to not include '..' in the results, it will
// result in an epic failure when deleting stuff.
Expand All @@ -92,8 +87,7 @@ std::vector<DirListNode> GetDirListing(std::string pathstring)
listing.push_back(node);

// List all the other files in the directory.
while (FindNextFile(hFind, &FindFileData) != 0)
{
while (FindNextFile(hFind, &FindFileData) != 0) {
DirListNode node;
node.name = FindFileData.cFileName;
node.dir = FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
Expand All @@ -103,15 +97,14 @@ std::vector<DirListNode> GetDirListing(std::string pathstring)

dwError = GetLastError();
FindClose(hFind);
if (dwError != ERROR_NO_MORE_FILES)
{
if (dwError != ERROR_NO_MORE_FILES) {
errorstream<<"GetDirListing: FindNextFile error. Error is "
<<dwError<<std::endl;
retval = (-1);
goto Cleanup;
}
}
retval = 0;
retval = 0;

Cleanup:
free(DirSpec);
Expand Down Expand Up @@ -242,53 +235,51 @@ std::vector<DirListNode> GetDirListing(std::string pathstring)
{
std::vector<DirListNode> listing;

DIR *dp;
struct dirent *dirp;
if((dp = opendir(pathstring.c_str())) == NULL) {
DIR *dp;
struct dirent *dirp;
if((dp = opendir(pathstring.c_str())) == NULL) {
//infostream<<"Error("<<errno<<") opening "<<pathstring<<std::endl;
return listing;
}
return listing;
}

while ((dirp = readdir(dp)) != NULL) {
while ((dirp = readdir(dp)) != NULL) {
// NOTE:
// Be very sure to not include '..' in the results, it will
// result in an epic failure when deleting stuff.
if(dirp->d_name[0]!='.'){
DirListNode node;
node.name = dirp->d_name;
if(node.name == "." || node.name == "..")
continue;
if(dirp->d_name == "." || dirp->d_name == "..")
continue;

DirListNode node;
node.name = dirp->d_name;

int isdir = -1; // -1 means unknown
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.
/*
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.
*/
Also we don't know whether symlinks are directories or not.
*/
#ifdef _DIRENT_HAVE_D_TYPE
if(dirp->d_type != DT_UNKNOWN && dirp->d_type != DT_LNK)
isdir = (dirp->d_type == DT_DIR);
if(dirp->d_type != DT_UNKNOWN && dirp->d_type != DT_LNK)
isdir = (dirp->d_type == DT_DIR);
#endif /* _DIRENT_HAVE_D_TYPE */

/*
Was d_type DT_UNKNOWN, DT_LNK or nonexistent?
If so, try stat().
*/
if(isdir == -1)
{
struct stat statbuf;
if (stat((pathstring + "/" + node.name).c_str(), &statbuf))
continue;
isdir = ((statbuf.st_mode & S_IFDIR) == S_IFDIR);
}
node.dir = isdir;
listing.push_back(node);
/*
Was d_type DT_UNKNOWN, DT_LNK or nonexistent?
If so, try stat().
*/
if(isdir == -1) {
struct stat statbuf;
if (stat((pathstring + "/" + node.name).c_str(), &statbuf))
continue;
isdir = ((statbuf.st_mode & S_IFDIR) == S_IFDIR);
}
}
closedir(dp);
node.dir = isdir;
listing.push_back(node);
}
closedir(dp);

return listing;
}
Expand Down

0 comments on commit 5229a22

Please sign in to comment.