aboutsummaryrefslogtreecommitdiff
path: root/src/common/util.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-09-06 11:50:22 -0400
committerNick Mathewson <nickm@torproject.org>2017-09-06 11:50:22 -0400
commit1098893e4f3753bf66248abf81702175dca980ee (patch)
tree65fba3d76ebd6bccb05a4dd5dd2661dfc1034244 /src/common/util.c
parent342712b9ef12c0234def9c2b4eb5c63f54c8bb5b (diff)
downloadtor-1098893e4f3753bf66248abf81702175dca980ee.tar.gz
tor-1098893e4f3753bf66248abf81702175dca980ee.zip
Exit when we can't write to a configured pid file
This is probably what the user wants, according to 20119.
Diffstat (limited to 'src/common/util.c')
-rw-r--r--src/common/util.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/common/util.c b/src/common/util.c
index 31d42a3e5c..36d0f4d068 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -3691,8 +3691,9 @@ finish_daemon(const char *cp)
#endif
/** Write the current process ID, followed by NL, into <b>filename</b>.
+ * Return 0 on success, -1 on failure.
*/
-void
+int
write_pidfile(const char *filename)
{
FILE *pidfile;
@@ -3700,13 +3701,19 @@ write_pidfile(const char *filename)
if ((pidfile = fopen(filename, "w")) == NULL) {
log_warn(LD_FS, "Unable to open \"%s\" for writing: %s", filename,
strerror(errno));
+ return -1;
} else {
#ifdef _WIN32
- fprintf(pidfile, "%d\n", (int)_getpid());
+ int pid = (int)_getpid();
#else
- fprintf(pidfile, "%d\n", (int)getpid());
+ int pid = (int)getpid();
#endif
- fclose(pidfile);
+ int rv = 0;
+ if (fprintf(pidfile, "%d\n", pid) < 0)
+ rv = -1;
+ if (fclose(pidfile) < 0)
+ rv = -1;
+ return rv;
}
}