GGLinnk/bees
1
0
Fork 0
mirror of https://github.com/Zygo/bees.git synced 2025-06-16 09:36:17 +02:00
Code Packages Activity

Merge remote-tracking branches 'kakra/feature/add-relative-path-option' and 'kakra/integration'

Browse Source
This commit is contained in:
Zygo Blaxell
2018-01-07 21:39:01 -05:00
parent 9d295fab4e 3024e43355 270a91cf17
commit ba981c133a
5 changed files with 49 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/fd.cc
View File

@ -527,6 +527,22 @@ namespace crucible {
THROW_ERROR(runtime_error, "readlink: maximum buffer size exceeded");
}
string
relative_path()
{
return __relative_path;
}
void
set_relative_path(string path)
{
path = path + "/";
for (string::size_type i = path.find("//"); i != string::npos; i = path.find("//")) {
path.erase(i, 1);
}
__relative_path = path;
}
// Turn a FD into a human-recognizable filename OR an error message.
string
name_fd(int fd)
@ -534,7 +550,12 @@ namespace crucible {
try {
ostringstream oss;
oss << "/proc/self/fd/" << fd;
return readlink_or_die(oss.str());
string path = readlink_or_die(oss.str());
if (!__relative_path.empty() && 0 == path.find(__relative_path))
{
path.erase(0, __relative_path.length());
}
return path;
} catch (exception &e) {
return string(e.what());
}