X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jcc.c;h=298eff523bd83bb11f62507e71300832b34e084f;hp=fdcd69b83c154385cac0354d26fa5c07219e384a;hb=aa1b69c44dad581f0756a5e95571df3afc644869;hpb=06d47abf41187eb7eb31f821a1a83cc98aa464b8

diff --git a/jcc.c b/jcc.c
index fdcd69b8..298eff52 100644
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,3 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.469 2017/08/12 09:36:42 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -128,9 +127,6 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.469 2017/08/12 09:36:42 fabiankeil Exp $"
 #include "client-tags.h"
 #endif
 
-const char jcc_h_rcs[] = JCC_H_VERSION;
-const char project_h_rcs[] = PROJECT_H_VERSION;
-
 int daemon_mode = 1;
 struct client_states clients[1];
 struct file_list     files[1];
@@ -2173,7 +2169,7 @@ static void handle_established_connection(struct client_state *csp)
                 */
                watch_client_socket = 0;
                log_error(LOG_LEVEL_CONNECT,
-                  "Stopping to watch the client socket %d. "
+                  "Stop watching client socket %d. "
                   "There's already another request waiting.",
                   csp->cfd);
                continue;
@@ -3985,8 +3981,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))