guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove some duplicate code

Browse Source
This commit is contained in:
Eelco Dolstra
2014-10-03 22:37:51 +02:00
parent c08c802bf3
commit 3f8576a6ab
4 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libexpr/primops.cc
+8 -15
View File
@@ -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();