diff options
| -rw-r--r-- | src/libexpr/primops.cc | 23 | ||||
| -rw-r--r-- | src/libstore/gc.cc | 8 | ||||
| -rw-r--r-- | src/libutil/util.cc | 10 | ||||
| -rw-r--r-- | src/libutil/util.hh | 2 |
4 files changed, 22 insertions, 21 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index ca4ccf449..461a54776 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(); diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc index 481f5a7c3..e9db711e7 100644 --- a/src/libstore/gc.cc +++ b/src/libstore/gc.cc @@ -301,12 +301,8 @@ static void findRoots(StoreAPI & store, const Path & path, unsigned char type, R { try { - if (type == DT_UNKNOWN) { - struct stat st = lstat(path); - if (S_ISDIR(st.st_mode)) type = DT_DIR; - else if (S_ISLNK(st.st_mode)) type = DT_LNK; - else if (S_ISREG(st.st_mode)) type = DT_REG; - } + if (type == DT_UNKNOWN) + type = getFileType(path); if (type == DT_DIR) { for (auto & i : readDirectory(path)) diff --git a/src/libutil/util.cc b/src/libutil/util.cc index 436580651..99d2b1e0a 100644 --- a/src/libutil/util.cc +++ b/src/libutil/util.cc @@ -227,6 +227,16 @@ DirEntries readDirectory(const Path & path) } +unsigned char getFileType(const Path & path) +{ + struct stat st = lstat(path); + if (S_ISDIR(st.st_mode)) return DT_DIR; + if (S_ISLNK(st.st_mode)) return DT_LNK; + if (S_ISREG(st.st_mode)) return DT_REG; + return DT_UNKNOWN; +} + + string readFile(int fd) { struct stat st; diff --git a/src/libutil/util.hh b/src/libutil/util.hh index 4f9f7422c..b35e02dce 100644 --- a/src/libutil/util.hh +++ b/src/libutil/util.hh @@ -77,6 +77,8 @@ typedef vector<DirEntry> DirEntries; DirEntries readDirectory(const Path & path); +unsigned char getFileType(const Path & path); + /* Read the contents of a file into a string. */ string readFile(int fd); string readFile(const Path & path, bool drain = false); |