Enable specifying directories in plugin-files. #1862
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
edolstra
reviewed
Feb 13, 2018
src/libstore/globals.cc
Outdated
| try { | ||
| auto ents = readDirectory(pluginFile); | ||
| for (auto & ent : ents) | ||
| pluginFiles.emplace_back(pluginFile + std::move(ent.name)); |
There was a problem hiding this comment.
Does this move actually accomplish anything? Isn't it a const argument to + anyway?
There was a problem hiding this comment.
Erm, right, this was from before I remembered the ent was relative. Will fix.
edolstra
reviewed
Feb 13, 2018
src/libstore/globals.cc
Outdated
| void *handle = | ||
| dlopen(file.c_str(), RTLD_LAZY | RTLD_LOCAL); | ||
| if (!handle) | ||
| throw Error(format("could not dynamically open plugin file '%1%': %2%") % file % dlerror()); |
There was a problem hiding this comment.
Note that nowadays you can write
throw Error("could not dynamically open plugin file '%s': %s", file, dlerror());
|
@edolstra fixed |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.