michael/luau
michael
/
luau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes IFTODT error while compiling from an android device (#199) 

Co-authored-by: Arseny Kapoulkine <arseny.kapoulkine@gmail.com>
This commit is contained in:
ThePotato 2021-11-12 14:58:34 +00:00 committed by GitHub
parent b7d26b371a
commit d11e8277c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CLI/FileUtils.cpp
View File

@ -142,6 +142,7 @@ static bool traverseDirectoryRec(const std::string& path, const std::function<vo
joinPaths(buf, path.c_str(), data.d_name); joinPaths(buf, path.c_str(), data.d_name);
int type = data.d_type; int type = data.d_type;
int mode = -1;
// we need to stat DT_UNKNOWN to be able to tell the type // we need to stat DT_UNKNOWN to be able to tell the type
if (type == DT_UNKNOWN) if (type == DT_UNKNOWN)
@ -153,18 +154,18 @@ static bool traverseDirectoryRec(const std::string& path, const std::function<vo
lstat(buf.c_str(), &st); lstat(buf.c_str(), &st);
#endif #endif
type = IFTODT(st.st_mode); mode = st.st_mode;
} }
if (type == DT_DIR) if (type == DT_DIR || mode == S_IFDIR)
{ {
traverseDirectoryRec(buf, callback); traverseDirectoryRec(buf, callback);
} }
else if (type == DT_REG) else if (type == DT_REG || mode == S_IFREG)
{ {
callback(buf); callback(buf);
} }
else if (type == DT_LNK) else if (type == DT_LNK || mode == S_IFLNK)
{ {
// Skip symbolic links to avoid handling cycles // Skip symbolic links to avoid handling cycles
} }