projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9e0d76c
)
Fixed line continuation problem
author
oes
<oes@users.sourceforge.net>
Fri, 1 Jun 2001 03:27:04 +0000
(
03:27
+0000)
committer
oes
<oes@users.sourceforge.net>
Fri, 1 Jun 2001 03:27:04 +0000
(
03:27
+0000)
loaders.c
patch
|
blob
|
history
permissionsfile
patch
|
blob
|
history
diff --git
a/loaders.c
b/loaders.c
index
ae8faaa
..
f0b1a97
100644
(file)
--- a/
loaders.c
+++ b/
loaders.c
@@
-1,4
+1,4
@@
-const char loaders_rcs[] = "$Id: loaders.c,v 1.1
2 2001/05/31 17:32:31 oes
Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.1
3 2001/05/31 21:28:49 jongfoster
Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loaders.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loaders.c,v $
@@
-35,6
+35,10
@@
const char loaders_rcs[] = "$Id: loaders.c,v 1.12 2001/05/31 17:32:31 oes Exp $"
*
* Revisions :
* $Log: loaders.c,v $
*
* Revisions :
* $Log: loaders.c,v $
+ * Revision 1.13 2001/05/31 21:28:49 jongfoster
+ * Removed all permissionsfile code - it's now called the actions
+ * file, and (almost) all the code is in actions.c
+ *
* Revision 1.12 2001/05/31 17:32:31 oes
*
* - Enhanced domain part globbing with infix and prefix asterisk
* Revision 1.12 2001/05/31 17:32:31 oes
*
* - Enhanced domain part globbing with infix and prefix asterisk
@@
-741,24
+745,29
@@
char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs)
*p = '\0';
}
}
*p = '\0';
}
}
-
- /* Remove leading and trailing whitespace */
- chomp(linebuf);
+ /* Write to the buffer */
if (*linebuf)
{
strncat(buf, linebuf, buflen - strlen(buf));
if (*linebuf)
{
strncat(buf, linebuf, buflen - strlen(buf));
- if (contflag)
- {
- contflag = 0;
- continue;
- }
- else
- {
- return buf;
- }
+ }
+
+ /* Continue? */
+ if (contflag)
+ {
+ contflag = 0;
+ continue;
+ }
+
+ /* Remove leading and trailing whitespace */
+ chomp(buf);
+
+ if (*buf)
+ {
+ return buf;
}
}
}
}
+
/* EOF */
return NULL;
/* EOF */
return NULL;
diff --git
a/permissionsfile
b/permissionsfile
index
0687f74
..
de7a16b
100755
(executable)
--- a/
permissionsfile
+++ b/
permissionsfile
@@
-3,7
+3,7
@@
#
# For information, see http://ijbswa.sourceforge.net/
#
#
# For information, see http://ijbswa.sourceforge.net/
#
-# $Id$
+# $Id
: permissionsfile,v 1.5 2001/05/31 21:32:15 jongfoster Exp
$
#
#############################################################################
# Syntax
#
#############################################################################
# Syntax
@@
-173,20
+173,19
@@
c3 = +no-cookies-set -no-cookies-read
#############################################################################
# Defaults
#############################################################################
#############################################################################
# Defaults
#############################################################################
-#FIXME: Line continuation is broken - can't split a line at whitespace.
-{ -\
-block +\
-fast-redirects +\
-filter +\
-hide-forwarded +\
-hide-from{block} +\
-hide-referer{forge} -\
-hide-user-agent -\
-image +\
-no-cookies-read +\
-no-cookies-set +\
-no-popups +\
-vanilla-wafer \
+{\
+-block \
++fast-redirects \
++filter \
++hide-forwarded \
++hide-from{block} \
++hide-referer{forge} \
+-hide-user-agent \
+-image \
++no-cookies-read \
++no-cookies-set \
++no-popups \
++vanilla-wafer \
}
/ # Match all URLs
}
/ # Match all URLs
@@
-194,8
+193,8
@@
vanilla-wafer \
# A useful site for testing - shows all headers:
# http://privacy.net/analyze/
#############################################################################
# A useful site for testing - shows all headers:
# http://privacy.net/analyze/
#############################################################################
-{+add-header{X-Privacy: Yes please}
+#-add-header{*} +
\
-add-header{X-User-Tracking: No thanks!} -filter}
+{+add-header{X-Privacy: Yes please}
#-add-header{*}
\
+
+
add-header{X-User-Tracking: No thanks!} -filter}
privacy.net
#############################################################################
privacy.net
#############################################################################