-const char miscutil_rcs[] = "$Id: miscutil.c,v 1.27 2002/01/21 00:52:32 jongfoster Exp $";
+const char miscutil_rcs[] = "$Id: miscutil.c,v 1.34 2002/03/24 13:25:43 swa Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $
* but don't really fit in any other file.
*
* Copyright : Written by and Copyright (C) 2001 the SourceForge
- * IJBSWA team. http://ijbswa.sourceforge.net
+ * Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* by and Copyright (C) 1997 Anonymous Coders and
*
* Revisions :
* $Log: miscutil.c,v $
+ * Revision 1.34 2002/03/24 13:25:43 swa
+ * name change related issues
+ *
+ * Revision 1.33 2002/03/07 03:46:53 oes
+ * Fixed compiler warnings etc
+ *
+ * Revision 1.32 2002/03/06 23:02:57 jongfoster
+ * Removing tabs
+ *
+ * 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.
+ *
* Revision 1.27 2002/01/21 00:52:32 jongfoster
* Adding string_join()
*
#include "project.h"
#include "miscutil.h"
#include "errlog.h"
+#include "jcc.h"
const char miscutil_h_rcs[] = MISCUTIL_H_VERSION;
* Returns : Pointer to newly malloc'd memory chunk.
*
*********************************************************************/
-void *zalloc(int size)
+void *zalloc(size_t size)
{
void * ret;
}
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 */
+
/*********************************************************************
*
*********************************************************************/
char *strsav(char *old, const char *text_to_append)
{
- int old_len, new_len = 0;
+ size_t old_len, new_len = 0;
char *p;
- if (( text_to_append == NULL) || (*text_to_append == '\0'))
+ if ((text_to_append == NULL) || (*text_to_append == '\0'))
{
return(old);
}
{
if ((p = strdup(text_to_append)) == NULL)
{
- log_error(LOG_LEVEL_FATAL, "strdup() failed!", new_len);
+ log_error(LOG_LEVEL_FATAL, "strdup() failed!");
/* Never get here - LOG_LEVEL_FATAL causes program exit */
}
return p;
*
* Parameters :
* 1 : string = string to be duplicated
- * 2 : n = number of bytes to duplicate
+ * 2 : len = number of bytes to duplicate
*
* Returns : pointer to copy, or NULL if failiure
*
*********************************************************************/
-char *bindup(const char *string, int n)
+char *bindup(const char *string, size_t len)
{
- char *dup;
+ char *duplicate;
- if (NULL == (dup = (char *)malloc(n)))
+ if (NULL == (duplicate = (char *)malloc(len)))
{
return NULL;
}
else
{
- memcpy(dup, string, n);
+ memcpy(duplicate, string, len);
}
- return dup;
+ return duplicate;
}
}
if ((dir == NULL) || (*dir == '\0') /* No directory specified */
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__OS2__)
|| (*file == '\\') || (file[1] == ':') /* Absolute path (DOS) */
-#else /* ifndef _WIN32 */
+#else /* ifndef _WIN32 || __OS2__ */
|| (*file == '/') /* Absolute path (U*ix) */
-#endif /* ifndef _WIN32 */
+#endif /* ifndef _WIN32 || __OS2__ */
)
{
return strdup(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
#endif /* defined unix */
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__OS2__)
if(path[strlen(path)-1] != '\\')
{
strcat(path, "\\");
}
-#else /* ifndef _WIN32 */
+#else /* ifndef _WIN32 || __OS2__ */
if(path[strlen(path)-1] != '/')
{
strcat(path, "/");
}
-#endif /* ifndef _WIN32 */
+#endif /* ifndef _WIN32 || __OS2__ */
strcat(path, file);
return path;
* 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) \