Ignore eventual / suffix in TMPDIR

2016-12-17 05:25:43 +00:00 · 2016-12-17 05:25:43 +00:00 · 28ddb3cb1f
commit 28ddb3cb1f
parent d8620b9e79
1 changed files with 5 additions and 3 deletions
--- a/src/remote.cc
+++ b/src/remote.cc
@ -480,10 +480,12 @@ void RemoteUI::set_ui_options(const Options& options)
    m_socket_watcher.events() |= FdEvents::Write;
 }

-static const char* tmpdir()
+static StringView tmpdir()
 {
-    if (const char* tmpdir = getenv("TMPDIR"))
-        return tmpdir;
+    StringView tmpdir = getenv("TMPDIR");
+    if (not tmpdir.empty())
+        return tmpdir.back() == '/' ? tmpdir.substr(0_byte, tmpdir.length()-1)
+                                    : tmpdir;
    return "/tmp";
 }