X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=miscutil.h;h=b3200d4ded0fae997236e1c696edc745a715f79e;hp=baab1e60beda5db392fc12f4fd455fb1e3508a91;hb=b0829aefd612a2211ac727294f36efa256a1beb3;hpb=0072b2fd5d165c25c258a69481b9a738bac9d801 diff --git a/miscutil.h b/miscutil.h index baab1e60..b3200d4d 100644 --- a/miscutil.h +++ b/miscutil.h @@ -1,6 +1,6 @@ #ifndef MISCUTIL_H_INCLUDED #define MISCUTIL_H_INCLUDED -#define MISCUTIL_H_VERSION "$Id: miscutil.h,v 1.27 2007/04/09 17:48:51 fabiankeil Exp $" +#define MISCUTIL_H_VERSION "$Id: miscutil.h,v 1.29 2007/09/09 18:20:20 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.h,v $ @@ -37,6 +37,17 @@ * * Revisions : * $Log: miscutil.h,v $ + * Revision 1.29 2007/09/09 18:20:20 fabiankeil + * Turn privoxy_strlcpy() into a function and try to work with + * b0rked snprintf() implementations too. Reported by icmp30. + * + * Revision 1.28 2007/05/11 11:48:16 fabiankeil + * - Delete strsav() which was replaced + * by string_append() years ago. + * - Add a strlcat() look-alike. + * - Use strlcat() and strlcpy() in those parts + * of the code that are run on unixes. + * * Revision 1.27 2007/04/09 17:48:51 fabiankeil * Check for HAVE_SNPRINTF instead of __OS2__ * before including the portable snprintf() code. @@ -196,8 +207,6 @@ extern jb_err string_join (char **target_string, char *text_to_append); extern char *string_toupper(const char *string); extern char *chomp(char *string); -extern int simplematch(char *pattern, char *text); - extern char *bindup(const char *string, size_t len); extern char *make_path(const char * dir, const char * file); @@ -218,7 +227,9 @@ time_t timegm(struct tm *tm); /* Here's looking at you, Ulrich. */ #if !defined(HAVE_STRLCPY) -#define strlcpy(dst, src, size) (size_t)snprintf((dst), (size), "%s", (src)) +size_t privoxy_strlcpy(char *destination, const char *source, size_t size); +#define strlcpy privoxy_strlcpy +#define USE_PRIVOXY_STRLCPY 1 #define HAVE_STRLCPY 1 #endif /* ndef HAVE_STRLCPY*/