X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=killpopup.c;h=4b1ceb0519c2de2580706bad8b1531d5957c9a12;hp=8a36e5847a02ae65d2f755289813beaf02d8a10c;hb=605576ce35e16c57567f79dd9086bb9ae001753b;hpb=a2aecee087f670ef38547fcc6ae9379188bbb1fa

diff --git a/killpopup.c b/killpopup.c
index 8a36e584..4b1ceb05 100644
--- a/killpopup.c
+++ b/killpopup.c
@@ -1,4 +1,4 @@
-const char killpopup_rcs[] = "$Id: killpopup.c,v 1.8 2001/07/30 22:08:36 jongfoster Exp $";
+const char killpopup_rcs[] = "$Id: killpopup.c,v 1.12 2001/10/25 03:40:48 david__schmidt Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/killpopup.c,v $
@@ -9,10 +9,10 @@ const char killpopup_rcs[] = "$Id: killpopup.c,v 1.8 2001/07/30 22:08:36 jongfos
  *                IJBSWA team.  http://ijbswa.sourceforge.net
  *
  *                Based on the Internet Junkbuster originally written
- *                by and Copyright (C) 1997 Anonymous Coders and 
+ *                by and Copyright (C) 1997 Anonymous Coders and
  *                Junkbusters Corporation.  http://www.junkbusters.com
  *
- *                This program is free software; you can redistribute it 
+ *                This program is free software; you can redistribute it
  *                and/or modify it under the terms of the GNU General
  *                Public License as published by the Free Software
  *                Foundation; either version 2 of the License, or (at
@@ -32,6 +32,22 @@ const char killpopup_rcs[] = "$Id: killpopup.c,v 1.8 2001/07/30 22:08:36 jongfos
  *
  * Revisions   :
  *    $Log: killpopup.c,v $
+ *    Revision 1.12  2001/10/25 03:40:48  david__schmidt
+ *    Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple
+ *    threads to call select() simultaneously.  So, it's time to do a real, live,
+ *    native OS/2 port.  See defines for __EMX__ (the porting layer) vs. __OS2__
+ *    (native). Both versions will work, but using __OS2__ offers multi-threading.
+ *
+ *    Revision 1.11  2001/10/07 15:42:41  oes
+ *    filter_popups now gets a csp pointer so it can raise the new
+ *      CSP_FLAG_MODIFIED flag.
+ *
+ *    Revision 1.10  2001/09/22 16:34:44  jongfoster
+ *    Removing unneeded #includes
+ *
+ *    Revision 1.9  2001/07/31 14:44:22  oes
+ *    Deleted unused size parameter from filter_popups()
+ *
  *    Revision 1.8  2001/07/30 22:08:36  jongfoster
  *    Tidying up #defines:
  *    - All feature #defines are now of the form FEATURE_xxx
@@ -83,18 +99,16 @@ const char killpopup_rcs[] = "$Id: killpopup.c,v 1.8 2001/07/30 22:08:36 jongfos
 #include <stdlib.h>
 #include <sys/types.h>
 #include <string.h>
-#include <malloc.h>
 #include <errno.h>
 #include <sys/stat.h>
 #include <ctype.h>
 
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__OS2__)
 #include <unistd.h>
 #endif
 
 #include "project.h"
 #include "killpopup.h"
-#include "jcc.h"
 #include "errlog.h"
 
 const char killpopup_h_rcs[] = KILLPOPUP_H_VERSION;
@@ -105,18 +119,19 @@ const char killpopup_h_rcs[] = KILLPOPUP_H_VERSION;
  *
  * Function    :  filter_popups
  *
- * Description :  Filter the block of data that's been read from the server.
- *                Caller is responsible for checking permissons list
- *                to determine if this function should be called.
- *                Remember not to change the content length (substitute char by char)
+ * Description :  Filter the block of data that's been read from the server
+ *                for javascript popup code and replace by syntactically
+ *                neutral code of the same size.
+ *                Raise the CSP_FLAG_MODIFIED flag on success.
  *
  * Parameters  :
  *          1  :  buff = Buffer to scan and modify.  Null terminated.
+ *          2  :  csp = Client state pointer
  *
  * Returns     :  void
  *
  *********************************************************************/
-void filter_popups(char *buff)
+void filter_popups(char *buff, struct client_state *csp)
 {
    char *popup = NULL;
    char *close = NULL;
@@ -132,9 +147,10 @@ void filter_popups(char *buff)
           */
          strncpy(popup, "1;''.concat(", 12);
          log_error(LOG_LEVEL_POPUPS, "Blocked popup window open");
+         csp->flags |= CSP_FLAG_MODIFIED;
       }
    }
-   
+
    while ((popup = strstr( buff, ".resizeTo(" )) != NULL)
    {
       if ( popup )
@@ -145,6 +161,7 @@ void filter_popups(char *buff)
           */
          strncpy(popup, ".scrollTo(", 10);
          log_error(LOG_LEVEL_POPUPS, "Blocked popup window resize");
+         csp->flags |= CSP_FLAG_MODIFIED;
       }
    }
 
@@ -163,11 +180,13 @@ void filter_popups(char *buff)
          if (p)
          {
             strncpy(p,"_nU_",4);
+            csp->flags |= CSP_FLAG_MODIFIED;
          }
          p=strstr(popup, "onExit");
          if (p)
          {
             strncpy(p,"_nE_",4);
+            csp->flags |= CSP_FLAG_MODIFIED;
          }
       }
    }