projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Regenerate for 3.0.26 (STABLE)
[privoxy.git]
/
miscutil.c
diff --git
a/miscutil.c
b/miscutil.c
index
ea2c3aa
..
97acd1e
100644
(file)
--- 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 $
/*********************************************************************
*
* 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 "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
#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);
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
*
*
* 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
*
*********************************************************************/
*
* Returns : N/A
*
*********************************************************************/
-void write_pid_file(
void
)
+void write_pid_file(
const char *pidfile
)
{
FILE *fp;
{
FILE *fp;
- /*
- * If no --pidfile option was given,
- * we can live without one.
- */
- if (pidfile == NULL) return;
-
if ((fp = fopen(pidfile, "w")) == NULL)
{
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
{
}
else
{