aleksanaa/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Fix builtins.readDir on XFS

Browse source 
The DT_UNKNOWN fallback code was getting the type of the wrong path,
causing readDir to report "directory" as the type of every file.

Reported by deepfire on IRC.
This commit is contained in:
Eelco Dolstra 2015-01-09 14:56:25 +01:00
parent 57d64d24aa
commit 2a3b1df423
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/primops.cc
View file

@ -796,7 +796,7 @@ static void prim_readDir(EvalState & state, const Pos & pos, Value * * args, Val
for (auto & ent : entries) { for (auto & ent : entries) {
Value * ent_val = state.allocAttr(v, state.symbols.create(ent.name)); Value * ent_val = state.allocAttr(v, state.symbols.create(ent.name));
if (ent.type == DT_UNKNOWN) if (ent.type == DT_UNKNOWN)
ent.type = getFileType(path); ent.type = getFileType(path + "/" + ent.name);
mkStringNoCopy(*ent_val, mkStringNoCopy(*ent_val,
ent.type == DT_REG ? "regular" : ent.type == DT_REG ? "regular" :
ent.type == DT_DIR ? "directory" : ent.type == DT_DIR ? "directory" :