lix-project/lix
20
55
Fork 31
Code Issues 345 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #1862 from shlevy/plugin-dirs

Browse source 
Enable specifying directories in plugin-files.
This commit is contained in:
Eelco Dolstra 2018-02-13 17:32:32 +01:00 committed by GitHub
parent f471aacff2 b8739f2fb3
commit 7253113fd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/manual/command-ref/conf-file.xml
View file

@ -764,6 +764,10 @@ builtins.fetchurl {
should not be linked to any Nix libs directly, as those will should not be linked to any Nix libs directly, as those will
be available already at load time. be available already at load time.
</para> </para>
<para>
If an entry in the list is a directory, all files in the
directory are loaded as plugins (non-recursively).
</para>
</listitem> </listitem>
</varlistentry> </varlistentry>

24
src/libstore/globals.cc
View file

@ -142,12 +142,24 @@ void MaxBuildJobsSetting::set(const std::string & str)
void initPlugins() void initPlugins()
{ {
for (const auto & pluginFile : settings.pluginFiles.get()) { for (const auto & pluginFile : settings.pluginFiles.get()) {
/* handle is purposefully leaked as there may be state in the Paths pluginFiles;
DSO needed by the action of the plugin. */ try {
void *handle = auto ents = readDirectory(pluginFile);
dlopen(pluginFile.c_str(), RTLD_LAZY | RTLD_LOCAL); for (const auto & ent : ents)
if (!handle) pluginFiles.emplace_back(pluginFile + "/" + ent.name);
throw Error(format("could not dynamically open plugin file '%1%': %2%") % pluginFile % dlerror()); } catch (SysError & e) {
if (e.errNo != ENOTDIR)
throw;
pluginFiles.emplace_back(pluginFile);
}
for (const auto & file : pluginFiles) {
/* handle is purposefully leaked as there may be state in the
DSO needed by the action of the plugin. */
void *handle =
dlopen(file.c_str(), RTLD_LAZY | RTLD_LOCAL);
if (!handle)
throw Error("could not dynamically open plugin file '%s%': %s%", file, dlerror());
}
} }
} }