From: Fabian Keil <fk@fabiankeil.de>
Date: Thu, 17 Aug 2017 17:12:15 +0000 (+0200)
Subject: Change write_pid_file()'s prototype to take the path as argument
X-Git-Tag: v_3_0_27~78
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=6157ccdeb4d417c8cf2df3c061632b4b4d4724c3

Change write_pid_file()'s prototype to take the path as argument
---

diff --git a/jcc.c b/jcc.c
index fdcd69b8..e7d88400 100644
--- a/jcc.c
+++ b/jcc.c
@@ -3985,8 +3985,10 @@ int main(int argc, char **argv)
     * As soon as we have written the PID file, we can switch
     * to the user and group ID indicated by the --user option
     */
-   write_pid_file();
-
+   if (pidfile != NULL)
+   {
+      write_pid_file(pidfile);
+   }
    if (NULL != pw)
    {
       if (setgid((NULL != grp) ? grp->gr_gid : pw->pw_gid))
diff --git a/miscutil.c b/miscutil.c
index 010745fb..79b1ae61 100644
--- a/miscutil.c
+++ b/miscutil.c
@@ -63,7 +63,6 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.85 2017/06/08 13:11:08 fabianke
 #include "project.h"
 #include "miscutil.h"
 #include "errlog.h"
-#include "jcc.h"
 
 const char miscutil_h_rcs[] = MISCUTIL_H_VERSION;
 
@@ -221,21 +220,16 @@ void *malloc_or_die(size_t buffer_size)
  * Description :  Writes a pid file with the pid of the main process.
  *                Exits if the file can't be opened
  *
- * Parameters  :  None
+ * Parameters  :
+ *          1  :  pidfile = Path of the pidfile that gets created.
  *
  * Returns     :  N/A
  *
  *********************************************************************/
-void write_pid_file(void)
+void write_pid_file(const char *pidfile)
 {
    FILE   *fp;
 
-   /*
-    * If no --pidfile option was given,
-    * we can live without one.
-    */
-   if (pidfile == NULL) return;
-
    if ((fp = fopen(pidfile, "w")) == NULL)
    {
       log_error(LOG_LEVEL_FATAL, "can't open pidfile '%s': %E", pidfile);
diff --git a/miscutil.h b/miscutil.h
index e65a8a2e..33e2996f 100644
--- a/miscutil.h
+++ b/miscutil.h
@@ -51,7 +51,7 @@ extern char *strdup_or_die(const char *str);
 extern void *malloc_or_die(size_t buffer_size);
 
 #if defined(unix)
-extern void write_pid_file(void);
+extern void write_pid_file(const char *pidfile);
 #endif /* unix */
 
 extern unsigned int hash_string(const char* s);