Removing tabs

[privoxy.git] / miscutil.c

diff --git a/miscutil.c b/miscutil.c
index 7c87458..74b894b 100644 (file)
--- a/miscutil.c
+++ b/miscutil.c
@@ -1,4 +1,4 @@
-const char miscutil_rcs[] = "$Id: miscutil.c,v 1.28 2002/03/03 09:18:03 joergs Exp $";
+const char miscutil_rcs[] = "$Id: miscutil.c,v 1.31 2002/03/05 04:52:42 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/miscutil.c,v $
@@ -36,6 +36,18 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.28 2002/03/03 09:18:03 joergs E
  *
  * Revisions   :
  *    $Log: miscutil.c,v $
+ *    Revision 1.31  2002/03/05 04:52:42  oes
+ *    Deleted non-errlog debugging code
+ *
+ *    Revision 1.30  2002/03/04 18:27:42  oes
+ *    - Deleted deletePidFile
+ *    - Made write_pid_file use the --pidfile option value
+ *      (or no PID file, if the option was absent)
+ *    - Played styleguide police
+ *
+ *    Revision 1.29  2002/03/04 02:08:02  david__schmidt
+ *    Enable web editing of actions file on OS/2 (it had been broken all this time!)
+ *
  *    Revision 1.28  2002/03/03 09:18:03  joergs
  *    Made jumbjuster work on AmigaOS again.
  *
@@ -188,6 +200,7 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.28 2002/03/03 09:18:03 joergs E
 #include "project.h"
 #include "miscutil.h"
 #include "errlog.h"
+#include "jcc.h"
 
 const char miscutil_h_rcs[] = MISCUTIL_H_VERSION;
 
@@ -214,53 +227,46 @@ void *zalloc(int size)
    }
 
    return(ret);
-}
-#if defined(unix)
-/*********************************************************************
- *
- * Function    : deletePidFile 
- *
- * Description :  deletes the pid file with the pid of the main process 
- *
- * Parameters  : -
- *
- * Returns     : - 
- *
- *********************************************************************/
-void deletePidFile( void )
-{
-  char pidfile[ 64 ];
 
-  snprintf( pidfile, sizeof(pidfile), "%s/%s", PID_FILE_PATH, PID_FILE_NAME);
-  unlink( pidfile );
 }
+
+
+#if defined(unix)
 /*********************************************************************
  *
- * Function    : writePidFile 
+ * Function    :  write_pid_file 
  *
- * Description :  writes the pid file with the pid of the main process 
+ * Description :  Writes a pid file with the pid of the main process 
  *
- * Parameters  : -
+ * Parameters  :  None
  *
- * Returns     : - 
+ * Returns     :  N/A 
  *
  *********************************************************************/
-void writePidFile( void )
+void write_pid_file(void)
 {
-  FILE   *fp;
-  char   pidfile[64];
+   FILE   *fp;
+   
+   /*
+    * If no --pidfile option was given,
+    * we can live without one.
+    */
+   if (pidfile == NULL) return;
 
-  snprintf( pidfile, sizeof(pidfile), "%s/%s", PID_FILE_PATH, PID_FILE_NAME);
-  if ((fp = fopen( pidfile,"w")) == NULL )
-  {
+   if ((fp = fopen(pidfile, "w")) == NULL)
+   {
       log_error(LOG_LEVEL_INFO, "can't open pidfile '%s': %E", pidfile);
-      return;
-  }
+   }
+   else
+   {
+      fprintf(fp, "%u\n", (unsigned int) getpid());
+      fclose (fp);
+   }
+   return;
 
-  fprintf( fp,"%u\n", (unsigned int) getpid());
-  fclose ( fp );
 }
-#endif /* unix */
+#endif /* def unix */
+
 
 /*********************************************************************
  *
@@ -887,18 +893,17 @@ char * make_path(const char * dir, const char * file)
 #if defined(unix)
       if ( *dir != '/' && basedir && *basedir )
       {
-             path = malloc( strlen( basedir ) + strlen(dir) + strlen(file) + 3);
-             if (!path ) log_error(LOG_LEVEL_FATAL, "malloc failed!");
-             strcpy(path, basedir);
-             strcat(path, "/");
-             strcat(path, dir);
-             DBG(1, ("make_path: path: %s\n",path) );
+         path = malloc( strlen( basedir ) + strlen(dir) + strlen(file) + 3);
+         if (!path ) log_error(LOG_LEVEL_FATAL, "malloc failed!");
+         strcpy(path, basedir);
+         strcat(path, "/");
+         strcat(path, dir);
       }
       else
       {
-             path = malloc(strlen(dir) + strlen(file) + 2);
-             if (!path ) log_error(LOG_LEVEL_FATAL, "malloc failed!");
-             strcpy(path, dir);
+         path = malloc(strlen(dir) + strlen(file) + 2);
+         if (!path ) log_error(LOG_LEVEL_FATAL, "malloc failed!");
+         strcpy(path, dir);
       }
 #else
 
@@ -1011,24 +1016,24 @@ Author
  * Small values favor memcpy, large values favor inline code.
  */
 #if defined(__alpha__) || defined(__alpha)
-#  define breakeven_point   2  /* AXP (DEC Alpha)     - gcc or cc or egcs */
+#  define breakeven_point   2    /* AXP (DEC Alpha)     - gcc or cc or egcs */
 #endif
 #if defined(__i386__)  || defined(__i386)
-#  define breakeven_point  12  /* Intel Pentium/Linux - gcc 2.96 */
+#  define breakeven_point  12    /* Intel Pentium/Linux - gcc 2.96 */
 #endif
 #if defined(__hppa)
-#  define breakeven_point  10  /* HP-PA               - gcc */
+#  define breakeven_point  10    /* HP-PA               - gcc */
 #endif
 #if defined(__sparc__) || defined(__sparc)
-#  define breakeven_point  33  /* Sun Sparc 5         - gcc 2.8.1 */
+#  define breakeven_point  33    /* Sun Sparc 5         - gcc 2.8.1 */
 #endif
 
 /* some other values of possible interest: */
-/* #define breakeven_point  8 */  /* VAX 4000          - vaxc */
-/* #define breakeven_point 19 */  /* VAX 4000          - gcc 2.7.0 */
+/* #define breakeven_point  8 */ /* VAX 4000          - vaxc */
+/* #define breakeven_point 19 */ /* VAX 4000          - gcc 2.7.0 */
 
 #ifndef breakeven_point
-#  define breakeven_point   6  /* some reasonable one-size-fits-all value */
+#  define breakeven_point   6    /* some reasonable one-size-fits-all value */
 #endif
 
 #define fast_memcpy(d,s,n) \