mirror of
https://github.com/NixOS/nix.git
synced 2025-11-16 23:42:43 +01:00
cc24766fa6
For example, instead of doing
#include "nix/store-config.hh"
#include "nix/derived-path.hh"
Now do
#include "nix/store/config.hh"
#include "nix/store/derived-path.hh"
This was originally planned in the issue, and also recent requested by
Eelco.
Most of the change is purely mechanical. There is just one small
additional issue. See how, in the example above, we took this
opportunity to also turn `<comp>-config.hh` into `<comp>/config.hh`.
Well, there was already a `nix/util/config.{cc,hh}`. Even though there
is not a public configuration header for libutil (which also would be
called `nix/util/config.{cc,hh}`) that's still confusing, To avoid any
such confusion, we renamed that to `nix/util/configuration.{cc,hh}`.
Finally, note that the libflake headers already did this, so we didn't
need to do anything to them. We wouldn't want to mistakenly get
`nix/flake/flake/flake.hh`!
Progress on #7876
98 lines
3.2 KiB
C++
98 lines
3.2 KiB
C++
#include "nix/util/environment-variables.hh"
|
|
#include "nix/util/executable-path.hh"
|
|
#include "nix/util/strings-inline.hh"
|
|
#include "nix/util/util.hh"
|
|
#include "nix/util/file-path-impl.hh"
|
|
|
|
namespace nix {
|
|
|
|
namespace fs {
|
|
using namespace std::filesystem;
|
|
}
|
|
|
|
constexpr static const OsStringView path_var_separator{
|
|
&ExecutablePath::separator,
|
|
1,
|
|
};
|
|
|
|
ExecutablePath ExecutablePath::load()
|
|
{
|
|
// "If PATH is unset or is set to null, the path search is
|
|
// implementation-defined."
|
|
// https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03
|
|
return ExecutablePath::parse(getEnvOs(OS_STR("PATH")).value_or(OS_STR("")));
|
|
}
|
|
|
|
ExecutablePath ExecutablePath::parse(const OsString & path)
|
|
{
|
|
auto strings = path.empty() ? (std::list<OsString>{})
|
|
: basicSplitString<std::list<OsString>, OsChar>(path, path_var_separator);
|
|
|
|
std::vector<fs::path> ret;
|
|
ret.reserve(strings.size());
|
|
|
|
std::transform(
|
|
std::make_move_iterator(strings.begin()),
|
|
std::make_move_iterator(strings.end()),
|
|
std::back_inserter(ret),
|
|
[](OsString && str) {
|
|
return fs::path{
|
|
str.empty()
|
|
// "A zero-length prefix is a legacy feature that
|
|
// indicates the current working directory. It
|
|
// appears as two adjacent <colon> characters
|
|
// ("::"), as an initial <colon> preceding the rest
|
|
// of the list, or as a trailing <colon> following
|
|
// the rest of the list."
|
|
// https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03
|
|
? OS_STR(".")
|
|
: std::move(str),
|
|
};
|
|
});
|
|
|
|
return {ret};
|
|
}
|
|
|
|
OsString ExecutablePath::render() const
|
|
{
|
|
std::vector<PathViewNG> path2;
|
|
path2.reserve(directories.size());
|
|
for (auto & p : directories)
|
|
path2.push_back(p.native());
|
|
return basicConcatStringsSep(path_var_separator, path2);
|
|
}
|
|
|
|
std::optional<fs::path>
|
|
ExecutablePath::findName(const OsString & exe, std::function<bool(const fs::path &)> isExecutable) const
|
|
{
|
|
// "If the pathname being sought contains a <slash>, the search
|
|
// through the path prefixes shall not be performed."
|
|
// https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03
|
|
assert(OsPathTrait<fs::path::value_type>::rfindPathSep(exe) == exe.npos);
|
|
|
|
for (auto & dir : directories) {
|
|
auto candidate = dir / exe;
|
|
if (isExecutable(candidate))
|
|
return candidate.lexically_normal();
|
|
}
|
|
|
|
return std::nullopt;
|
|
}
|
|
|
|
fs::path ExecutablePath::findPath(const fs::path & exe, std::function<bool(const fs::path &)> isExecutable) const
|
|
{
|
|
// "If the pathname being sought contains a <slash>, the search
|
|
// through the path prefixes shall not be performed."
|
|
// https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03
|
|
if (exe.filename() == exe) {
|
|
auto resOpt = findName(exe, isExecutable);
|
|
if (resOpt)
|
|
return *resOpt;
|
|
else
|
|
throw ExecutableLookupError("Could not find executable '%s'", exe.string());
|
|
} else {
|
|
return exe;
|
|
}
|
|
}
|
|
|
|
} // namespace nix
|