-/* vim:ts=3: */
-const char miscutil_rcs[] = "$Id: miscutil.c,v 1.12 2001/06/09 10:55:28 jongfoster Exp $";
+const char miscutil_rcs[] = "$Id: miscutil.c,v 1.21 2001/10/23 21:27:50 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $
*
* Revisions :
* $Log: miscutil.c,v $
+ * Revision 1.21 2001/10/23 21:27:50 jongfoster
+ * Standardising error codes in string_append
+ * make_path() no longer adds '\\' if the dir already ends in '\\' (this
+ * is just copying a UNIX-specific fix to the Windows-specific part)
+ *
+ * Revision 1.20 2001/10/22 15:33:56 david__schmidt
+ * Special-cased OS/2 out of the Netscape-abort-on-404-in-js problem in
+ * filters.c. Added a FIXME in front of the offending code. I'll gladly
+ * put in a better/more robust fix for all parties if one is presented...
+ * It seems that just returning 200 instead of 404 would pretty much fix
+ * it for everyone, but I don't know all the history of the problem.
+ *
+ * Revision 1.19 2001/10/14 22:02:57 jongfoster
+ * New function string_append() which is like strsav(), but running
+ * out of memory isn't automatically FATAL.
+ *
+ * Revision 1.18 2001/09/20 13:33:43 steudten
+ *
+ * change long to int as return value in hash_string(). Remember the wraparound
+ * for int = long = sizeof(4) - thats maybe not what we want.
+ *
+ * Revision 1.17 2001/09/13 20:51:29 jongfoster
+ * Fixing potential problems with characters >=128 in simplematch()
+ * This was also a compiler warning.
+ *
+ * Revision 1.16 2001/09/10 10:56:59 oes
+ * Silenced compiler warnings
+ *
+ * Revision 1.15 2001/07/13 14:02:24 oes
+ * Removed vim-settings
+ *
+ * Revision 1.14 2001/06/29 21:45:41 oes
+ * Indentation, CRLF->LF, Tab-> Space
+ *
+ * Revision 1.13 2001/06/29 13:32:14 oes
+ * Removed logentry from cancelled commit
+ *
* Revision 1.12 2001/06/09 10:55:28 jongfoster
* Changing BUFSIZ ==> BUFFER_SIZE
*
#include <string.h>
#include <malloc.h>
#include <ctype.h>
+#include <assert.h>
-/*\r
- * FIXME: Only need project.h for BUFFER_SIZE. It would be nice\r
- * to remove this dependency.\r
- */\r
-#include "project.h"\r
-#include "miscutil.h"\r
+#include "project.h"
+#include "miscutil.h"
#include "errlog.h"
const char miscutil_h_rcs[] = MISCUTIL_H_VERSION;
-/* Fix a problem with Solaris. There should be no effect on other
- * platforms.
- * Solaris's isspace() is a macro which uses it's argument directly
- * as an array index. Therefore we need to make sure that high-bit
- * characters generate +ve values, and ideally we also want to make
- * the argument match the declared parameter type of "int".
- */
-#define ijb_tolower(__X) tolower((int)(unsigned char)(__X))
-#define ijb_isspace(__X) isspace((int)(unsigned char)(__X))
-
/*********************************************************************
*
* Function : zalloc
* Returns : an unsigned long variable with the hashed value.
*
*********************************************************************/
-unsigned long hash_string( const char* s )
+unsigned int hash_string( const char* s )
{
- unsigned long h = 0ul;
+ unsigned int h = 0;
for ( ; *s; ++s )
{
}
+
/*********************************************************************
*
* Function : strsav
*
* Description : Reallocate "old" and append text to it. This makes
* it easier to append to malloc'd strings.
+ * Running out of memory is a FATAL error.
*
* Parameters :
* 1 : old = Old text that is to be extended. Will be
- * free()d by this routine.
+ * free()d by this routine. May be NULL.
* 2 : text_to_append = Text to be appended to old.
+ * May be NULL.
*
* Returns : Pointer to newly malloc'ed appended string.
* If there is no text to append, return old. Caller
*********************************************************************/
char *strsav(char *old, const char *text_to_append)
{
- int old_len, new_len;
+ int old_len, new_len = 0;
char *p;
if (( text_to_append == NULL) || (*text_to_append == '\0'))
return(old);
}
- if (NULL != old)
+ if (NULL == old)
{
- old_len = strlen(old);
+ if ((p = strdup(text_to_append)) == NULL)
+ {
+ log_error(LOG_LEVEL_FATAL, "strdup() failed!", new_len);
+ /* Never get here - LOG_LEVEL_FATAL causes program exit */
+ }
+ return p;
}
- else
+
+ old_len = strlen(old);
+ new_len = old_len + strlen(text_to_append) + 1;
+
+ if ((p = realloc(old, new_len)) == NULL)
{
- old_len = 0;
+ log_error(LOG_LEVEL_FATAL, "realloc(%d) bytes failed!", new_len);
+ /* Never get here - LOG_LEVEL_FATAL causes program exit */
}
- new_len = old_len + strlen(text_to_append) + 1;
+ strcpy(p + old_len, text_to_append);
+ return(p);
+}
+
+
+/*********************************************************************
+ *
+ * Function : string_append
+ *
+ * Description : Reallocate target_string and append text to it.
+ * This makes it easier to append to malloc'd strings.
+ * This is similar to strsav(), but running out of
+ * memory isn't catastrophic.
+ *
+ * Programming style:
+ *
+ * The following style provides sufficient error
+ * checking for this routine, with minimal clutter
+ * in the source code. It is recommended if you
+ * have many calls to this function:
+ *
+ * char * s = strdup(...); // don't check for error
+ * string_append(&s, ...); // don't check for error
+ * string_append(&s, ...); // don't check for error
+ * string_append(&s, ...); // don't check for error
+ * if (NULL == s) { ... handle error ... }
+ *
+ * OR, equivalently:
+ *
+ * char * s = strdup(...); // don't check for error
+ * string_append(&s, ...); // don't check for error
+ * string_append(&s, ...); // don't check for error
+ * if (string_append(&s, ...)) {... handle error ...}
+ *
+ * Parameters :
+ * 1 : target_string = Pointer to old text that is to be
+ * extended. *target_string will be free()d by this
+ * routine. target_string must be non-NULL.
+ * If *target_string is NULL, this routine will
+ * do nothing and return with an error - this allows
+ * you to make many calls to this routine and only
+ * check for errors after the last one.
+ * 2 : text_to_append = Text to be appended to old.
+ * Must not be NULL.
+ *
+ * Returns : JB_ERR_OK on success, and sets *target_string
+ * to newly malloc'ed appended string. Caller
+ * must free(*target_string).
+ * JB_ERR_MEMORY on out-of-memory. (And free()s
+ * *target_string and sets it to NULL).
+ * JB_ERR_MEMORY if *target_string is NULL.
+ *
+ *********************************************************************/
+jb_err string_append(char **target_string, const char *text_to_append)
+{
+ size_t old_len;
+ char *new_string;
- if (old)
+ assert(target_string);
+ assert(text_to_append);
+
+ if (*target_string == NULL)
{
- if ((p = realloc(old, new_len)) == NULL)
- {
- log_error(LOG_LEVEL_FATAL, "realloc(%d) bytes failed!", new_len);
- /* Never get here - LOG_LEVEL_FATAL causes program exit */
- }
+ return JB_ERR_MEMORY;
}
- else
+
+ if (*text_to_append == '\0')
{
- if ((p = (char *)malloc(new_len)) == NULL)
- {
- log_error(LOG_LEVEL_FATAL, "malloc(%d) bytes failed!", new_len);
- /* Never get here - LOG_LEVEL_FATAL causes program exit */
- }
+ return JB_ERR_OK;
}
- strcpy(p + old_len, text_to_append);
- return(p);
+ old_len = strlen(*target_string);
+
+ if (NULL == (new_string = realloc(*target_string,
+ strlen(text_to_append) + old_len + 1)))
+ {
+ free(*target_string);
+
+ *target_string = NULL;
+ return JB_ERR_MEMORY;
+ }
+
+ strcpy(new_string + old_len, text_to_append);
+ *target_string = new_string;
+ return JB_ERR_OK;
}
*********************************************************************/
int simplematch(char *pattern, char *text)
{
- char *fallback;
- char *pat = pattern;
- char *txt = text;
+ unsigned char *pat = (unsigned char *) pattern;
+ unsigned char *txt = (unsigned char *) text;
+ unsigned char *fallback = pat;
int wildcard = 0;
- char lastchar = 'a';
+ unsigned char lastchar = 'a';
unsigned i;
unsigned char charmap[32];
if (NULL == (dup = (char *)malloc(n)))
{
- return NULL;
- }
+ return NULL;
+ }
else
- {
- memcpy(dup, string, n);
- }
+ {
+ memcpy(dup, string, n);
+ }
return dup;
char * path = malloc(strlen(dir) + strlen(file) + 2);
strcpy(path, dir);
#ifdef _WIN32
- strcat(path, "\\");
+ if(path[strlen(path)-1] != '\\')
+ {
+ strcat(path, "\\");
+ }
#else /* ifndef _WIN32 */
- if(path[strlen(path)-1] != '/') strcat(path, "/");
+ if(path[strlen(path)-1] != '/')
+ {
+ strcat(path, "/");
+ }
#endif /* ifndef _WIN32 */
strcat(path, file);
projects / privoxy.git / blobdiff