projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add line number in error output for lineparsing for
[privoxy.git]
/
killpopup.c
diff --git
a/killpopup.c
b/killpopup.c
index
7043def
..
3e594c5
100644
(file)
--- a/
killpopup.c
+++ b/
killpopup.c
@@
-1,4
+1,4
@@
-const char killpopup_rcs[] = "$Id: killpopup.c,v 1.
9 2001/07/31 14:44:22
oes Exp $";
+const char killpopup_rcs[] = "$Id: killpopup.c,v 1.
11 2001/10/07 15:42:41
oes Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/killpopup.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/killpopup.c,v $
@@
-9,10
+9,10
@@
const char killpopup_rcs[] = "$Id: killpopup.c,v 1.9 2001/07/31 14:44:22 oes Exp
* IJBSWA team. http://ijbswa.sourceforge.net
*
* Based on the Internet Junkbuster originally written
* 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
*
* 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
* 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,13
@@
const char killpopup_rcs[] = "$Id: killpopup.c,v 1.9 2001/07/31 14:44:22 oes Exp
*
* Revisions :
* $Log: killpopup.c,v $
*
* Revisions :
* $Log: killpopup.c,v $
+ * 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.9 2001/07/31 14:44:22 oes
* Deleted unused size parameter from filter_popups()
*
@@
-91,7
+98,7
@@
const char killpopup_rcs[] = "$Id: killpopup.c,v 1.9 2001/07/31 14:44:22 oes Exp
#include <sys/stat.h>
#include <ctype.h>
#include <sys/stat.h>
#include <ctype.h>
-#if
ndef _WIN32
+#if
!defined(_WIN32) && !defined(__OS2__)
#include <unistd.h>
#endif
#include <unistd.h>
#endif
@@
-107,18
+114,19
@@
const char killpopup_h_rcs[] = KILLPOPUP_H_VERSION;
*
* Function : filter_popups
*
*
* 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
.
- * R
emember 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
.
+ * R
aise the CSP_FLAG_MODIFIED flag on success.
*
* Parameters :
* 1 : buff = Buffer to scan and modify. Null terminated.
*
* Parameters :
* 1 : buff = Buffer to scan and modify. Null terminated.
+ * 2 : csp = Client state pointer
*
* Returns : void
*
*********************************************************************/
*
* Returns : void
*
*********************************************************************/
-void filter_popups(char *buff)
+void filter_popups(char *buff
, struct client_state *csp
)
{
char *popup = NULL;
char *close = NULL;
{
char *popup = NULL;
char *close = NULL;
@@
-134,9
+142,10
@@
void filter_popups(char *buff)
*/
strncpy(popup, "1;''.concat(", 12);
log_error(LOG_LEVEL_POPUPS, "Blocked popup window open");
*/
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 )
while ((popup = strstr( buff, ".resizeTo(" )) != NULL)
{
if ( popup )
@@
-147,6
+156,7
@@
void filter_popups(char *buff)
*/
strncpy(popup, ".scrollTo(", 10);
log_error(LOG_LEVEL_POPUPS, "Blocked popup window resize");
*/
strncpy(popup, ".scrollTo(", 10);
log_error(LOG_LEVEL_POPUPS, "Blocked popup window resize");
+ csp->flags |= CSP_FLAG_MODIFIED;
}
}
}
}
@@
-165,11
+175,13
@@
void filter_popups(char *buff)
if (p)
{
strncpy(p,"_nU_",4);
if (p)
{
strncpy(p,"_nU_",4);
+ csp->flags |= CSP_FLAG_MODIFIED;
}
p=strstr(popup, "onExit");
if (p)
{
strncpy(p,"_nE_",4);
}
p=strstr(popup, "onExit");
if (p)
{
strncpy(p,"_nE_",4);
+ csp->flags |= CSP_FLAG_MODIFIED;
}
}
}
}
}
}