X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=miscutil.c;h=97acd1ea3e715bd8f46f9110f441ad4bd7a3c7cb;hb=1ab5d5c80b0d088ecd058454aee0c1911cac80bd;hp=ea2c3aae18a9e3d9fef7f98200bdb1c2ed4f8876;hpb=2f180f0a2a126bd3da1b5bf3466ee1ed247cf91e;p=privoxy.git diff --git a/miscutil.c b/miscutil.c index ea2c3aae..97acd1ea 100644 --- a/miscutil.c +++ b/miscutil.c @@ -1,4 +1,3 @@ -const char miscutil_rcs[] = "$Id: miscutil.c,v 1.83 2017/05/04 14:34:18 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $ @@ -63,9 +62,6 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.83 2017/05/04 14:34:18 fabianke #include "project.h" #include "miscutil.h" #include "errlog.h" -#include "jcc.h" - -const char miscutil_h_rcs[] = MISCUTIL_H_VERSION; /********************************************************************* * @@ -87,6 +83,7 @@ void *zalloc(size_t size) #ifdef HAVE_CALLOC ret = calloc(1, size); #else +#warning calloc appears to be unavailable. Your platform will become unsupported in the future if ((ret = (void *)malloc(size)) != NULL) { memset(ret, 0, size); @@ -217,26 +214,22 @@ void *malloc_or_die(size_t buffer_size) * * Function : write_pid_file * - * Description : Writes a pid file with the pid of the main process + * 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_INFO, "can't open pidfile '%s': %E", pidfile); + log_error(LOG_LEVEL_FATAL, "can't open pidfile '%s': %E", pidfile); } else {