X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=parsers.c;h=9f6f71e324a5f6cde5e47d2df704f271036130bc;hb=ef08d06738bab1735cdb7df8bdf305cf2f16f670;hp=a0da912a0b97c6017b6567e8cb00fe4f94b8e241;hpb=34bf407d7722634d6363c46dd4d0df00f53732ef;p=privoxy.git diff --git a/parsers.c b/parsers.c index a0da912a..9f6f71e3 100644 --- a/parsers.c +++ b/parsers.c @@ -1,4 +1,4 @@ -const char parsers_rcs[] = "$Id: parsers.c,v 1.48 2002/03/07 03:46:53 oes Exp $"; +const char parsers_rcs[] = "$Id: parsers.c,v 1.53 2002/03/26 22:29:55 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/parsers.c,v $ @@ -14,7 +14,7 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.48 2002/03/07 03:46:53 oes Exp $" * and `server_set_cookie'. * * 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 @@ -40,6 +40,42 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.48 2002/03/07 03:46:53 oes Exp $" * * Revisions : * $Log: parsers.c,v $ + * Revision 1.53 2002/03/26 22:29:55 swa + * we have a new homepage! + * + * Revision 1.52 2002/03/24 13:25:43 swa + * name change related issues + * + * Revision 1.51 2002/03/13 00:27:05 jongfoster + * Killing warnings + * + * Revision 1.50 2002/03/12 01:45:35 oes + * More verbose logging + * + * Revision 1.49 2002/03/09 20:03:52 jongfoster + * - Making various functions return int rather than size_t. + * (Undoing a recent change). Since size_t is unsigned on + * Windows, functions like read_socket that return -1 on + * error cannot return a size_t. + * + * THIS WAS A MAJOR BUG - it caused frequent, unpredictable + * crashes, and also frequently caused JB to jump to 100% + * CPU and stay there. (Because it thought it had just + * read ((unsigned)-1) == 4Gb of data...) + * + * - The signature of write_socket has changed, it now simply + * returns success=0/failure=nonzero. + * + * - Trying to get rid of a few warnings --with-debug on + * Windows, I've introduced a new type "jb_socket". This is + * used for the socket file descriptors. On Windows, this + * is SOCKET (a typedef for unsigned). Everywhere else, it's + * an int. The error value can't be -1 any more, so it's + * now JB_INVALID_SOCKET (which is -1 on UNIX, and in + * Windows it maps to the #define INVALID_SOCKET.) + * + * - The signature of bind_port has changed. + * * Revision 1.48 2002/03/07 03:46:53 oes * Fixed compiler warnings etc * @@ -455,7 +491,7 @@ int flush_socket(jb_socket fd, struct client_state *csp) return(0); } - if (write_socket(fd, iob->cur, len)) + if (write_socket(fd, iob->cur, (size_t)len)) { return(-1); } @@ -476,10 +512,10 @@ int flush_socket(jb_socket fd, struct client_state *csp) * 2 : buf = holds the content to be added to the page * 3 : n = number of bytes to be added * - * Returns : Number of bytes in the content buffer. + * Returns : None * *********************************************************************/ -size_t add_to_iob(struct client_state *csp, char *buf, size_t n) +void add_to_iob(struct client_state *csp, char *buf, int n) { struct iob *iob = csp->iob; size_t have, need; @@ -489,7 +525,7 @@ size_t add_to_iob(struct client_state *csp, char *buf, size_t n) if (n <= 0) { - return(have); + return; } need = have + n; @@ -519,7 +555,7 @@ size_t add_to_iob(struct client_state *csp, char *buf, size_t n) } /* copy the new data into the iob buffer */ - memcpy(p, buf, n); + memcpy(p, buf, (size_t)n); /* point to the end of the data */ p += n; @@ -531,7 +567,7 @@ size_t add_to_iob(struct client_state *csp, char *buf, size_t n) iob->cur = iob->buf; iob->eod = p; - return(need); + return; } @@ -576,7 +612,7 @@ char *get_header(struct client_state *csp) iob->cur = p+1; - if ((q = strchr(ret, '\r'))) *q = '\0'; + if ((q = strchr(ret, '\r')) != NULL) *q = '\0'; /* is this a blank linke (i.e. the end of the header) ? */ if (*ret == '\0') @@ -1008,7 +1044,7 @@ jb_err client_te(struct client_state *csp, char **header) *********************************************************************/ jb_err client_referrer(struct client_state *csp, char **header) { - const char * newval; + const char *newval; #ifdef FEATURE_FORCE_LOAD /* Since the referrer can include the prefix even @@ -1064,11 +1100,11 @@ jb_err client_referrer(struct client_state *csp, char **header) log_error(LOG_LEVEL_ERROR, "Bad parameter: +referer{%s}", newval); } - log_error(LOG_LEVEL_HEADER, "crunch+forge!"); *header = strdup("Referer: http://"); string_append(header, csp->http->hostport); string_append(header, "/"); - + log_error(LOG_LEVEL_HEADER, "crunch+forge to %s", *header); + return (*header == NULL) ? JB_ERR_MEMORY : JB_ERR_OK; } } @@ -1095,7 +1131,7 @@ jb_err client_referrer(struct client_state *csp, char **header) *********************************************************************/ jb_err client_uagent(struct client_state *csp, char **header) { - const char * newval; + const char *newval; if ((csp->action->flags & ACTION_HIDE_USER_AGENT) == 0) { @@ -1167,7 +1203,7 @@ jb_err client_ua(struct client_state *csp, char **header) *********************************************************************/ jb_err client_from(struct client_state *csp, char **header) { - const char * newval; + const char *newval; if ((csp->action->flags & ACTION_HIDE_FROM) == 0) { @@ -1628,7 +1664,7 @@ jb_err server_set_cookie(struct client_state *csp, char **header) int changed = 0; /* A variable to store the tag we're working on */ - char * cur_tag; + char *cur_tag; /* Skip "Set-Cookie:" (11 characters) in header */ cur_tag = *header + 11; @@ -1643,7 +1679,7 @@ jb_err server_set_cookie(struct client_state *csp, char **header) while (*cur_tag) { /* Find next tag */ - char * next_tag = strchr(cur_tag, ';'); + char *next_tag = strchr(cur_tag, ';'); if (next_tag != NULL) { /* Skip the ';' character itself */ @@ -1715,7 +1751,7 @@ int strclean(const char *string, const char *substring) int hits = 0, len = strlen(substring); char *pos, *p; - while((pos = strstr(string, substring))) + while((pos = strstr(string, substring)) != NULL) { p = pos + len; do