github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-22 15:37:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

status fish-path: Remove "(deleted)" suffix

Browse Source 
Fixes #9018.
This commit is contained in:
Fabian Boehm 2022-06-16 16:36:05 +02:00
parent cf8b51b2a5
commit 6e0653af93
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common.cpp
View File

@ -1887,7 +1887,17 @@ std::string get_executable_path(const char *argv0) {
}
if (len > 0) {
buff[len] = '\0';
return std::string(buff);
// When /proc/self/exe points to a file that was deleted (or overwritten on update!)
// then linux adds a " (deleted)" suffix.
// If that's not a valid path, let's remove that awkward suffix.
std::string buffstr{buff};
if (access(buff, F_OK)) {
auto dellen = const_strlen(" (deleted)");
if (buffstr.size() > dellen && buffstr.compare(buffstr.size() - dellen, dellen, " (deleted)") == 0) {
buffstr = buffstr.substr(0, buffstr.size() - const_strlen(" (deleted)"));
}
}
return buffstr;
}
#endif