diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-03T20·37+0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-03T20·37+0200 |
commit | 3f8576a6abedfa7c16d6f13dbdbabaa695cf60bb (patch) | |
tree | e1aad65d6748f23229b06768d61c21401de2a98f /src/libexpr | |
parent | c08c802bf31ce739e0de6d1fbfe4d58b808ae9bb (diff) |
Remove some duplicate code
Diffstat (limited to 'src/libexpr')
-rw-r--r-- | src/libexpr/primops.cc | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index ca4ccf449599..461a5477686c 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -815,22 +815,15 @@ static void prim_readDir(EvalState & state, const Pos & pos, Value * * args, Val DirEntries entries = readDirectory(path); state.mkAttrs(v, entries.size()); - for (const auto & ent : entries) { + for (auto & ent : entries) { Value * ent_val = state.allocAttr(v, state.symbols.create(ent.name)); - if (ent.type == DT_UNKNOWN) { - struct stat st = lstat(path + "/" + ent.name); - mkString(*ent_val, - S_ISREG(st.st_mode) ? "regular" : - S_ISDIR(st.st_mode) ? "directory" : - S_ISLNK(st.st_mode) ? "symlink" : - "unknown"); - } else { - mkString(*ent_val, - ent.type == DT_REG ? "regular" : - ent.type == DT_DIR ? "directory" : - ent.type == DT_LNK ? "symlink" : - "unknown"); - } + if (ent.type == DT_UNKNOWN) + ent.type = getFileType(path); + mkString(*ent_val, + ent.type == DT_REG ? "regular" : + ent.type == DT_DIR ? "directory" : + ent.type == DT_LNK ? "symlink" : + "unknown"); } v.attrs->sort(); |