0
0
Fork 0
forked from lix-project/lix

code review comments

This commit is contained in:
Jude Taylor 2016-08-15 10:43:14 -07:00
parent 60f4b25d7d
commit adf0216d98

View file

@ -11,14 +11,11 @@
using namespace nix; using namespace nix;
typedef std::map<string, std::set<string>> SetMap;
static auto cacheDir = Path{}; static auto cacheDir = Path{};
Path resolveCacheFile(const Path & lib) { Path resolveCacheFile(Path lib) {
Path lib2 = Path(lib); std::replace(lib.begin(), lib.end(), '/', '%');
std::replace(lib2.begin(), lib2.end(), '/', '%'); return cacheDir + "/" + lib;
return cacheDir + "/" + lib2;
} }
std::set<string> readCacheFile(const Path & file) { std::set<string> readCacheFile(const Path & file) {
@ -34,169 +31,169 @@ void writeCacheFile(const Path & file, std::set<string> & deps) {
fp.close(); fp.close();
} }
std::string find_dylib_name(FILE *obj_file, struct load_command cmd) { std::string findDylibName(FILE *obj_file, struct load_command cmd) {
fpos_t pos; fpos_t pos;
fgetpos(obj_file, &pos); fgetpos(obj_file, &pos);
struct dylib_command dylc; struct dylib_command dylc;
dylc.cmd = cmd.cmd; dylc.cmd = cmd.cmd;
dylc.cmdsize = cmd.cmdsize; dylc.cmdsize = cmd.cmdsize;
fread(&dylc.dylib, sizeof(struct dylib), 1, obj_file); fread(&dylc.dylib, sizeof(struct dylib), 1, obj_file);
char *dylib_name = (char*)calloc(cmd.cmdsize, sizeof(char)); char *dylib_name = (char*)calloc(cmd.cmdsize, sizeof(char));
fseek(obj_file, fseek(obj_file,
// offset is calculated from the beginning of the load command, which is two // offset is calculated from the beginning of the load command, which is two
// uint32_t's backwards // uint32_t's backwards
dylc.dylib.name.offset - (sizeof(uint32_t) * 2) + pos, dylc.dylib.name.offset - (sizeof(uint32_t) * 2) + pos,
SEEK_SET); SEEK_SET);
fread(dylib_name, sizeof(char), cmd.cmdsize, obj_file); fread(dylib_name, sizeof(char), cmd.cmdsize, obj_file);
fseek(obj_file, pos, SEEK_SET); fseek(obj_file, pos, SEEK_SET);
return std::string(dylib_name); return std::string(dylib_name);
} }
bool seek_mach64_blob(FILE *obj_file, enum NXByteOrder end) { bool seekMach64Blob(FILE *obj_file, enum NXByteOrder end) {
struct fat_header head; struct fat_header head;
fread(&head, sizeof(struct fat_header), 1, obj_file); fread(&head, sizeof(struct fat_header), 1, obj_file);
swap_fat_header(&head, end); swap_fat_header(&head, end);
for(uint32_t narches = 0; narches < head.nfat_arch; narches++) { for(uint32_t narches = 0; narches < head.nfat_arch; narches++) {
struct fat_arch arch; struct fat_arch arch;
fread(&arch, sizeof(struct fat_arch), 1, obj_file); fread(&arch, sizeof(struct fat_arch), 1, obj_file);
swap_fat_arch(&arch, 1, end); swap_fat_arch(&arch, 1, end);
if(arch.cputype == CPU_TYPE_X86_64) { if(arch.cputype == CPU_TYPE_X86_64) {
fseek(obj_file, arch.offset, SEEK_SET); fseek(obj_file, arch.offset, SEEK_SET);
return true; return true;
}
} }
} return false;
return false;
} }
std::set<std::string> runResolver(const Path & filename) { std::set<std::string> runResolver(const Path & filename) {
FILE *obj_file = fopen(filename.c_str(), "rb"); FILE *obj_file = fopen(filename.c_str(), "rb");
uint32_t magic; uint32_t magic;
fread(&magic, sizeof(uint32_t), 1, obj_file); fread(&magic, sizeof(uint32_t), 1, obj_file);
fseek(obj_file, 0, SEEK_SET); fseek(obj_file, 0, SEEK_SET);
enum NXByteOrder endianness; enum NXByteOrder endianness;
if(magic == 0xBEBAFECA) { if(magic == 0xBEBAFECA) {
endianness = NX_BigEndian; endianness = NX_BigEndian;
if(!seek_mach64_blob(obj_file, endianness)) { if(!seekMach64Blob(obj_file, endianness)) {
std::cerr << "Could not find any mach64 blobs in file " << filename << ", continuing..." << std::endl; std::cerr << "Could not find any mach64 blobs in file " << filename << ", continuing..." << std::endl;
return std::set<string>(); return std::set<string>();
}
} }
} struct mach_header_64 header;
struct mach_header_64 header; fread(&header, sizeof(struct mach_header_64), 1, obj_file);
fread(&header, sizeof(struct mach_header_64), 1, obj_file); if(!(header.magic == MH_MAGIC_64 || header.magic == MH_CIGAM_64)) {
if(!(header.magic == MH_MAGIC_64 || header.magic == MH_CIGAM_64)) { std::cerr << "Not a mach-o object file: " << filename << std::endl;
std::cerr << "Not a mach-o object file: " << filename << std::endl; return std::set<string>();
return std::set<string>();
}
std::set<string> libs;
for(uint32_t i = 0; i < header.ncmds; i++) {
struct load_command cmd;
fread(&cmd.cmd, sizeof(uint32_t), 1, obj_file);
fread(&cmd.cmdsize, sizeof(uint32_t), 1, obj_file);
switch(cmd.cmd) {
case LC_LOAD_DYLIB:
case LC_LOAD_UPWARD_DYLIB:
case LC_REEXPORT_DYLIB:
libs.insert(find_dylib_name(obj_file, cmd));
break;
} }
fseek(obj_file, cmd.cmdsize - (sizeof(uint32_t) * 2), SEEK_CUR); std::set<string> libs;
} for(uint32_t i = 0; i < header.ncmds; i++) {
fclose(obj_file); struct load_command cmd;
libs.erase(filename); fread(&cmd.cmd, sizeof(cmd.cmd), 1, obj_file);
return libs; fread(&cmd.cmdsize, sizeof(cmd.cmdsize), 1, obj_file);
switch(cmd.cmd) {
case LC_LOAD_DYLIB:
case LC_LOAD_UPWARD_DYLIB:
case LC_REEXPORT_DYLIB:
libs.insert(findDylibName(obj_file, cmd));
break;
}
fseek(obj_file, cmd.cmdsize - (sizeof(uint32_t) * 2), SEEK_CUR);
}
fclose(obj_file);
libs.erase(filename);
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))
throw SysError(format("getting attributes of path %1%") % path); throw SysError(format("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]; char buf[PATH_MAX];
ssize_t len = readlink(path.c_str(), buf, sizeof(buf) - 1); ssize_t len = readlink(path.c_str(), buf, sizeof(buf) - 1);
if(len != -1) { if(len != -1) {
buf[len] = 0; buf[len] = 0;
return Path(buf); return Path(buf);
} else { } else {
throw SysError(format("readlink('%1%')") % path); throw SysError(format("readlink('%1%')") % path);
} }
} }
std::set<string> resolve_tree(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.find(path) != deps.end()) {
return std::set<string>(); return std::set<string>();
}
deps.insert(path);
for (auto & lib : runResolver(path)) {
results.insert(lib);
for (auto & p : resolve_tree(lib, deps)) {
results.insert(p);
} }
} deps.insert(path);
return results; for (auto & lib : runResolver(path)) {
results.insert(lib);
for (auto & p : resolveTree(lib, deps)) {
results.insert(p);
}
}
return results;
} }
std::set<string> get_path(const Path & path) { std::set<string> getPath(const Path & path) {
Path cacheFile = resolveCacheFile(path); Path cacheFile = resolveCacheFile(path);
if(pathExists(cacheFile)) { if(pathExists(cacheFile)) {
return readCacheFile(cacheFile); return readCacheFile(cacheFile);
} }
std::set<string> deps; std::set<string> deps;
std::set<string> paths; std::set<string> paths;
paths.insert(path); paths.insert(path);
Path next_path = Path(path); Path next_path = Path(path);
while(isSymlink(next_path)) { while(isSymlink(next_path)) {
next_path = resolveSymlink(next_path); next_path = resolveSymlink(next_path);
paths.insert(next_path); paths.insert(next_path);
} }
for(auto & t : resolve_tree(next_path, deps)) { for(auto & t : resolveTree(next_path, 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();
struct utsname _uname; struct utsname _uname;
uname(&_uname); uname(&_uname);
cacheDir = (format("%1%/dependency-maps/%2%-%3%-%4%") cacheDir = (format("%1%/dependency-maps/%2%-%3%-%4%")
% settings.nixStateDir % settings.nixStateDir
% _uname.machine % _uname.machine
% _uname.sysname % _uname.sysname
% _uname.release).str(); % _uname.release).str();
auto store = openStore(); auto store = openStore();
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> all_paths;
for (auto & path : impurePaths) { for (auto & path : impurePaths) {
for(auto & p : get_path(path)) { for(auto & p : getPath(path)) {
all_paths.insert(p); all_paths.insert(p);
}
} }
}
std::cout << "extra-chroot-dirs" << std::endl; std::cout << "extra-chroot-dirs" << std::endl;
for(auto & path : all_paths) { for(auto & path : all_paths) {
std::cout << path << std::endl; std::cout << path << std::endl;
} }
std::cout << std::endl; std::cout << std::endl;
}); });
} }