h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-12 14:51:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

fixup! Move get_runtime_path() to env.cpp and expose it in env.h

Browse Source
This commit is contained in:
Mahmoud Al-Qudsi
2018-09-28 11:49:06 -05:00
parent 9d0050023c
commit dd8c4cfb33
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/env.cpp
View File

@@ -1632,7 +1632,11 @@ maybe_t<env_var_t> env_vars_snapshot_t::get(const wcstring &key) const {
}
#if !defined(__APPLE__) && !defined(__CYGWIN__)
#if defined(__APPLE__) || defined(__CYGWIN__)
static int check_runtime_path(const char *path) {
return 0;
}
#else
/// Check, and create if necessary, a secure runtime path. Derived from tmux.c in tmux
/// (http://tmux.sourceforge.net/).
static int check_runtime_path(const char *path) {
@@ -1679,13 +1683,11 @@ wcstring env_get_runtime_path() {
std::string tmpdir = "/tmp/fish.";
tmpdir.append(uname);
#if !defined(__APPLE__) && !defined(__CYGWIN__)
if (check_runtime_path(tmpdir.c_str()) != 0) {
debug(0, L"Runtime path not available.");
debug(0, L"Try deleting the directory %s and restarting fish.", tmpdir.c_str());
return result;
}
#endif
result = str2wcstring(tmpdir);
}