From 6e0653af9325844ff1701d332ec8e2e0b57d8ee3 Mon Sep 17 00:00:00 2001 From: Fabian Boehm Date: Thu, 16 Jun 2022 16:36:05 +0200 Subject: [PATCH] status fish-path: Remove "(deleted)" suffix Fixes #9018. --- src/common.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/common.cpp b/src/common.cpp index 2c275c4ef..d5498782d 100644 --- a/src/common.cpp +++ b/src/common.cpp @@ -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