From: oes <oes@users.sourceforge.net>
Date: Fri, 13 Jul 2001 13:59:53 +0000 (+0000)
Subject:  - Introduced gif_deanimate_response which shares the
X-Git-Tag: v_2_9_9~269
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=e23257d162f842b41571671c70bc141b0c1399b4

 - Introduced gif_deanimate_response which shares the
   generic content modification interface of pcrs_filter_response
   and acts as a wrapper to deanimate.c:gif_deanimate()
 - Renamed re_process_buffer to pcrs_filter_response
 - pcrs_filter_response now returns NULL on failiure
 - Removed all #ifdef PCRS
---

diff --git a/filters.c b/filters.c
index 0192314c..53748f10 100644
--- a/filters.c
+++ b/filters.c
@@ -1,4 +1,4 @@
-const char filters_rcs[] = "$Id: filters.c,v 1.19 2001/06/29 21:45:41 oes Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.20 2001/07/01 17:01:04 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/filters.c,v $
@@ -8,7 +8,7 @@ const char filters_rcs[] = "$Id: filters.c,v 1.19 2001/06/29 21:45:41 oes Exp $"
  *                   `acl_addr', `add_stats', `block_acl', `block_imageurl',
  *                   `block_url', `url_actions', `domaincmp', `dsplit',
  *                   `filter_popups', `forward_url', 'redirect_url',
- *                   `ij_untrusted_url', `intercept_url', `re_process_buffer',
+ *                   `ij_untrusted_url', `intercept_url', `pcrs_filter_respose',
  *                   `show_proxy_args', 'ijb_send_banner', and `trust_url'
  *
  * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
@@ -38,6 +38,9 @@ const char filters_rcs[] = "$Id: filters.c,v 1.19 2001/06/29 21:45:41 oes Exp $"
  *
  * Revisions   :
  *    $Log: filters.c,v $
+ *    Revision 1.20  2001/07/01 17:01:04  oes
+ *    Added comments and missing return statement in is_untrusted_url()
+ *
  *    Revision 1.19  2001/06/29 21:45:41  oes
  *    Indentation, CRLF->LF, Tab-> Space
  *
@@ -246,6 +249,7 @@ const char filters_rcs[] = "$Id: filters.c,v 1.19 2001/06/29 21:45:41 oes Exp $"
 #include "actions.h"
 #include "cgi.h"
 #include "list.h"
+#include "deanimate.h"
 
 #ifdef _WIN32
 #include "win32.h"
@@ -866,10 +870,9 @@ int is_untrusted_url(struct client_state *csp)
 #endif /* def TRUST_FILES */
 
 
-#ifdef PCRS
 /*********************************************************************
  *
- * Function    :  re_process_buffer
+ * Function    :  pcrs_filter_response
  *
  * Description :  Apply all the pcrs jobs from the joblist (re_filterfile)
  *                to the text buffer that's been accumulated in 
@@ -880,10 +883,10 @@ int is_untrusted_url(struct client_state *csp)
  *          1  :  csp = Current client state (buffers, headers, etc...)
  *
  * Returns     :  a pointer to the (newly allocated) modified buffer.
- *                or an empty string in case something went wrong
+ *                or NULL in case something went wrong
  *                
  *********************************************************************/
-char *re_process_buffer(struct client_state *csp)
+char *pcrs_filter_response(struct client_state *csp)
 {
    int hits=0;
    int size = csp->iob->eod - csp->iob->cur;
@@ -897,13 +900,13 @@ char *re_process_buffer(struct client_state *csp)
    /* Sanity first ;-) */
    if (size <= 0)
    {
-      return(strdup(""));
+      return(NULL);
    }
 
    if ( ( NULL == (fl = csp->rlist) ) || ( NULL == (b = fl->f) ) )
    {
       log_error(LOG_LEVEL_ERROR, "Unable to get current state of regexp filtering.");
-      return(strdup(""));
+      return(NULL);
    }
 
    log_error(LOG_LEVEL_RE_FILTER, "re_filtering %s%s (size %d) ...",
@@ -926,7 +929,57 @@ char *re_process_buffer(struct client_state *csp)
    return(new);
 
 }
-#endif /* def PCRS */
+
+
+/*********************************************************************
+ *
+ * Function    :  gif_deanimate_response
+ *
+ * Description :  Deanimate the GIF image that has been accumulated in 
+ *                csp->iob->buf and set csp->content_length to the modified
+ *                size.
+ *
+ * Parameters  :
+ *          1  :  csp = Current client state (buffers, headers, etc...)
+ *
+ * Returns     :  a pointer to the (newly allocated) modified buffer.
+ *                or NULL in case something went wrong.
+ *                
+ *********************************************************************/
+char *gif_deanimate_response(struct client_state *csp)
+{
+   struct binbuffer *in, *out;
+   char *p;
+   int size = csp->iob->eod - csp->iob->cur;
+
+   if (  (NULL == (in =  (struct binbuffer *)zalloc(sizeof *in )))
+      || (NULL == (out = (struct binbuffer *)zalloc(sizeof *out))) )
+   {
+      log_error(LOG_LEVEL_DEANIMATE, "failed! (No Mem!)");
+      return NULL;
+   }
+
+   in->buffer = csp->iob->cur;
+   in->size = size;
+
+   if (gif_deanimate(in, out))
+   {
+      log_error(LOG_LEVEL_DEANIMATE, "failed! (size %d)", size);
+      free(in);
+      buf_free(out);
+      return(NULL);
+   }
+   else
+   {
+      log_error(LOG_LEVEL_DEANIMATE, "Success! GIF shrunk from %d bytes to %d.", size, out->offset);
+      csp->content_length = out->offset;
+      p = out->buffer;
+      free(in);
+      free(out);
+      return(p);
+   }  
+
+}
 
 
 /*********************************************************************