resolve-system-dependencies: Several fixes

This fixes

  error: getting attributes of path ‘Versions/Current/CoreFoundation’: No such file or directory

when /System/Library/Frameworks/CoreFoundation.framework/CoreFoundation is a symlink.

Also fixes a segfault when encounting a file that is not a MACH binary (such
as /dev/null, which is included in __impureHostDeps in Nixpkgs).

Possibly fixes #786.
This commit is contained in:
Eelco Dolstra 2017-05-30 15:56:40 +02:00
parent 9bdb88ea6e
commit 83eec5a997

View file

@ -17,34 +17,50 @@ using namespace nix;
static auto cacheDir = Path{}; static auto cacheDir = Path{};
Path resolveCacheFile(Path lib) { Path resolveCacheFile(Path lib)
{
std::replace(lib.begin(), lib.end(), '/', '%'); std::replace(lib.begin(), lib.end(), '/', '%');
return cacheDir + "/" + lib; return cacheDir + "/" + lib;
} }
std::set<string> readCacheFile(const Path & file) { std::set<string> readCacheFile(const Path & file)
{
return tokenizeString<set<string>>(readFile(file), "\n"); return tokenizeString<set<string>>(readFile(file), "\n");
} }
void writeCacheFile(const Path & file, std::set<string> & deps) { void writeCacheFile(const Path & file, std::set<string> & deps)
{
std::ofstream fp; std::ofstream fp;
fp.open(file); fp.open(file);
for (auto & d : deps) { for (auto & d : deps)
fp << d << "\n"; fp << d << "\n";
}
fp.close(); fp.close();
} }
std::string findDylibName(bool should_swap, ptrdiff_t dylib_command_start) { std::string findDylibName(bool should_swap, ptrdiff_t dylib_command_start)
{
struct dylib_command *dylc = (struct dylib_command*)dylib_command_start; struct dylib_command *dylc = (struct dylib_command*)dylib_command_start;
return std::string((char*)(dylib_command_start + DO_SWAP(should_swap, dylc->dylib.name.offset))); return std::string((char*)(dylib_command_start + DO_SWAP(should_swap, dylc->dylib.name.offset)));
} }
std::set<std::string> runResolver(const Path & filename) { std::set<std::string> runResolver(const Path & filename)
int fd = open(filename.c_str(), O_RDONLY); {
struct stat s; AutoCloseFD fd = open(filename.c_str(), O_RDONLY);
fstat(fd, &s); if (!fd)
void *obj = mmap(NULL, s.st_size, PROT_READ, MAP_SHARED, fd, 0); throw SysError("opening %s", filename);
struct stat st;
if (fstat(fd.get(), &st))
throw SysError("statting %s", filename);
if (st.st_size < sizeof(mach_header_64)) {
printError("file %s is too short for a MACH binary", filename);
return {};
}
void *obj = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd.get(), 0);
if (!obj)
throw SysError("mmapping %s", filename);
ptrdiff_t mach64_offset = 0; ptrdiff_t mach64_offset = 0;
@ -63,13 +79,13 @@ std::set<std::string> runResolver(const Path & filename) {
} }
if (mach64_offset == 0) { if (mach64_offset == 0) {
printError(format("Could not find any mach64 blobs in file %1%, continuing...") % filename); printError(format("Could not find any mach64 blobs in file %1%, continuing...") % filename);
return std::set<string>(); return {};
} }
} else if (magic == MH_MAGIC_64 || magic == MH_CIGAM_64) { } else if (magic == MH_MAGIC_64 || magic == MH_CIGAM_64) {
mach64_offset = 0; mach64_offset = 0;
} else { } else {
printError(format("Object file has unknown magic number %1%, skipping it...") % magic); printError(format("Object file has unknown magic number %1%, skipping it...") % magic);
return std::set<string>(); return {};
} }
ptrdiff_t mach_header_offset = (ptrdiff_t)obj + mach64_offset; ptrdiff_t mach_header_offset = (ptrdiff_t)obj + mach64_offset;
@ -94,30 +110,28 @@ std::set<std::string> runResolver(const Path & filename) {
return libs; return libs;
} }
bool isSymlink(const Path & path) { bool isSymlink(const Path & path)
{
struct stat st; struct stat st;
if(lstat(path.c_str(), &st)) if (lstat(path.c_str(), &st) == -1)
throw SysError(format("getting attributes of path %1%") % path); throw SysError("getting attributes of path %1%", path);
return S_ISLNK(st.st_mode); return S_ISLNK(st.st_mode);
} }
Path resolveSymlink(const Path & path) { Path resolveSymlink(const Path & path)
char buf[PATH_MAX]; {
ssize_t len = readlink(path.c_str(), buf, sizeof(buf) - 1); auto target = readLink(path);
if(len != -1) { return hasPrefix(target, "/")
buf[len] = 0; ? target
return Path(buf); : dirOf(path) + "/" + target;
} else {
throw SysError(format("readlink('%1%')") % path);
}
} }
std::set<string> resolveTree(const Path & path, PathSet & deps) { std::set<string> resolveTree(const Path & path, PathSet & deps)
{
std::set<string> results; std::set<string> results;
if(deps.find(path) != deps.end()) { if (deps.count(path))
return std::set<string>(); return {};
}
deps.insert(path); deps.insert(path);
for (auto & lib : runResolver(path)) { for (auto & lib : runResolver(path)) {
results.insert(lib); results.insert(lib);
@ -128,32 +142,33 @@ std::set<string> resolveTree(const Path & path, PathSet & deps) {
return results; return results;
} }
std::set<string> getPath(const Path & path) { std::set<string> getPath(const Path & path)
Path cacheFile = resolveCacheFile(path); {
if(pathExists(cacheFile)) { if (hasPrefix(path, "/dev")) return {};
return readCacheFile(cacheFile);
}
std::set<string> deps; Path cacheFile = resolveCacheFile(path);
std::set<string> paths; if (pathExists(cacheFile))
return readCacheFile(cacheFile);
std::set<string> deps, paths;
paths.insert(path); paths.insert(path);
Path next_path = Path(path); Path nextPath(path);
while(isSymlink(next_path)) { while (isSymlink(nextPath)) {
next_path = resolveSymlink(next_path); nextPath = resolveSymlink(nextPath);
paths.insert(next_path); paths.insert(nextPath);
} }
for(auto & t : resolveTree(next_path, deps)) { for (auto & t : resolveTree(nextPath, deps))
paths.insert(t); paths.insert(t);
}
writeCacheFile(cacheFile, paths); writeCacheFile(cacheFile, paths);
return paths; return paths;
} }
int main(int argc, char ** argv) { int main(int argc, char ** argv)
{
return handleExceptions(argv[0], [&]() { return handleExceptions(argv[0], [&]() {
initNix(); initNix();
@ -177,18 +192,15 @@ int main(int argc, char ** argv) {
auto drv = store->derivationFromPath(Path(argv[1])); auto drv = store->derivationFromPath(Path(argv[1]));
Strings impurePaths = tokenizeString<Strings>(get(drv.env, "__impureHostDeps")); Strings impurePaths = tokenizeString<Strings>(get(drv.env, "__impureHostDeps"));
std::set<string> all_paths; std::set<string> allPaths;
for (auto & path : impurePaths) { for (auto & path : impurePaths)
for(auto & p : getPath(path)) { for (auto & p : getPath(path))
all_paths.insert(p); allPaths.insert(p);
}
}
std::cout << "extra-chroot-dirs" << std::endl; std::cout << "extra-chroot-dirs" << std::endl;
for(auto & path : all_paths) { for (auto & path : allPaths)
std::cout << path << std::endl; std::cout << path << std::endl;
}
std::cout << std::endl; std::cout << std::endl;
}); });
} }