aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-07-19 11:50:38 +0200
committerRiccardo Spagni <ric@spagni.net>2017-07-19 11:50:38 +0200
commitfed3430b701c6bf7d5e07449263cb11a65f8243d (patch)
tree1d30b58df3ed994928501f80e9f0b6e446ce30cb /src
parentMerge pull request #2165 (diff)
parentDon't hardcode /tmp (diff)
downloadmonero-fed3430b701c6bf7d5e07449263cb11a65f8243d.tar.xz
Merge pull request #2166
33d17c37 Don't hardcode /tmp (Howard Chu)
Diffstat (limited to 'src')
-rw-r--r--src/daemonizer/posix_fork.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/daemonizer/posix_fork.cpp b/src/daemonizer/posix_fork.cpp
index 949c0f593..d9b4a6d0e 100644
--- a/src/daemonizer/posix_fork.cpp
+++ b/src/daemonizer/posix_fork.cpp
@@ -14,6 +14,10 @@
#include <string>
#include <sys/stat.h>
+#ifndef TMPDIR
+#define TMPDIR "/tmp"
+#endif
+
namespace posix {
namespace {
@@ -76,12 +80,16 @@ void fork()
}
// Send standard output to a log file.
- const char* output = "/tmp/bitmonero.daemon.stdout.stderr";
+ const char *tmpdir = getenv("TMPDIR");
+ if (!tmpdir)
+ tmpdir = TMPDIR;
+ std::string output = tmpdir;
+ output += "/bitmonero.daemon.stdout.stderr";
const int flags = O_WRONLY | O_CREAT | O_APPEND;
const mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
- if (open(output, flags, mode) < 0)
+ if (open(output.c_str(), flags, mode) < 0)
{
- quit("Unable to open output file: " + std::string(output));
+ quit("Unable to open output file: " + output);
}
// Also send standard error to the same log file.