zebreus/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests 1 Activity

Fix tests on systems with a non-master git defaultBranch #1

Open
zebreus wants to merge 140 commits from fix-tests-without-master into main
pull from: fix-tests-without-master
merge into: zebreus:main
Conversation 0 Commits 140 Files changed 216 +16 -5
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 742303dc3a - Show all commits

14
src/libutil/file-system.cc
View file

@ -17,15 +17,19 @@ namespace fs = std::filesystem;
namespace nix { namespace nix {
Path getCwd() {
char buf[PATH_MAX];
if (!getcwd(buf, sizeof(buf))) {
throw SysError("cannot get cwd");
}
return Path(buf);
}
Path absPath(Path path, std::optional<PathView> dir, bool resolveSymlinks) Path absPath(Path path, std::optional<PathView> dir, bool resolveSymlinks)
{ {
if (path.empty() || path[0] != '/') { if (path.empty() || path[0] != '/') {
if (!dir) { if (!dir) {
char buf[PATH_MAX]; path = concatStrings(getCwd(), "/", path);
if (!getcwd(buf, sizeof(buf))) {
throw SysError("cannot get cwd");
}
path = concatStrings(buf, "/", path);
} else { } else {
path = concatStrings(*dir, "/", path); path = concatStrings(*dir, "/", path);
} }

7
src/libutil/file-system.hh
View file

@ -29,6 +29,13 @@ namespace nix {
struct Sink; struct Sink;
struct Source; struct Source;
/**
* Get the current working directory.
*
* Throw an error if the current directory cannot get got.
*/
Path getCwd();
/** /**
* @return An absolutized path, resolving paths relative to the * @return An absolutized path, resolving paths relative to the
* specified directory, or the current directory otherwise. The path * specified directory, or the current directory otherwise. The path