X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=doc%2Fsource%2Fdeveloper-manual.sgml;h=ad706c4a4e0db823c73130fb30425b441dfb6dbd;hb=983ba27e15f4691702d498b14f6c1459254bcc78;hp=3250f7705c0e60052b9b88666c9f1f37d297a3f7;hpb=9d2f5ca1c5c10d5d74eda833c342c1e05e1586ea;p=privoxy.git
diff --git a/doc/source/developer-manual.sgml b/doc/source/developer-manual.sgml
index 3250f770..ad706c4a 100644
--- a/doc/source/developer-manual.sgml
+++ b/doc/source/developer-manual.sgml
@@ -5,10 +5,7 @@
-
-
-
-
+
@@ -24,9 +21,9 @@
This file belongs into
ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
- $Id: developer-manual.sgml,v 2.41 2012/03/19 12:56:08 fabiankeil Exp $
+ $Id: developer-manual.sgml,v 2.73 2016/07/28 08:25:33 fabiankeil Exp $
- Copyright (C) 2001-2012 Privoxy Developers http://www.privoxy.org/
+ Copyright (C) 2001-2016 Privoxy Developers https://www.privoxy.org/
See LICENSE.
========================================================================
@@ -45,13 +42,14 @@
- Copyright &my-copy; 2001-2009 by
- Privoxy Developers
+ Copyright
+ &my-copy; 2001-2016 by
+ Privoxy Developers
- $Id: developer-manual.sgml,v 2.41 2012/03/19 12:56:08 fabiankeil Exp $
+ $Id: developer-manual.sgml,v 2.73 2016/07/28 08:25:33 fabiankeil Exp $
-
-
@@ -138,7 +134,7 @@ Hal.
Quickstart to Privoxy Development
The first step is to join the developer's mailing list.
+ url="https://lists.privoxy.org/mailman/listinfo/privoxy-devel">privoxy-devel mailing list.
You can submit your ideas, or even better patches. Patches are best
submitted to the Sourceforge tracker set up for this purpose, but
can be sent to the list for review too.
@@ -169,11 +165,8 @@ Hal.
Access to CVS
The project's CVS repository is hosted on
- SourceForge.
- Please refer to the chapters 6 and 7 in
- SF's site
- documentation for the technical access details for your
- operating system. For historical reasons, the CVS server is
+ SourceForge.
+ For historical reasons, the CVS server is
called ijbswa.cvs.sourceforge.net, the repository is
called ijbswa, and the source tree module is called
current.
@@ -187,9 +180,11 @@ Hal.
mentioned, the sources are in the current
module
. Other modules are present for platform specific
issues. There is a webview of the CVS hierarchy at http://ijbswa.cvs.sourceforge.net/ijbswa/,
+ url="http://ijbswa.cvs.sourceforge.net/viewvc/ijbswa/"
+ >http://ijbswa.cvs.sourceforge.net/viewvc/ijbswa/,
which might help with visualizing how these pieces fit together.
+
At one time there were two distinct branches: stable and unstable. The
more drastic changes were to be in the unstable branch. These branches
@@ -227,8 +223,8 @@ Hal.
The source tree is the heart of every software project. Every effort must
be made to ensure that it is readable, compilable and consistent at all
- times. There are differing guidelines for the stable branch and the
- main development trunk, and we ask anyone with CVS access to strictly
+ times. We expect anyone with CVS access to strictly
adhere to the following guidelines:
@@ -266,7 +262,7 @@ Hal.
Note that near a major public release, we get more cautious.
There is always the possibility to submit a patch to the patch
+ url="https://sourceforge.net/tracker/?atid=311118&group_id=11118&func=browse">patch
tracker instead.
@@ -302,7 +298,7 @@ Hal.
Alternately, proposed changes can be submitted as patches to the patch tracker on
Sourceforge first: http://sourceforge.net/tracker/?group_id=11118&atid=311118.
+ url="https://sourceforge.net/tracker/?group_id=11118&atid=311118">https://sourceforge.net/tracker/?group_id=11118&atid=311118.
Then ask for peer review.
@@ -363,14 +359,12 @@ Hal.
Packagers are encouraged to include this documentation. For those without
the ability to build the docs locally, text versions of each are kept in
CVS. HTML versions are also being kept in CVS under
- doc/webserver/*. And PDF version are kept in
- doc/pdf/*.
+ doc/webserver/*.
Formal documents are built with the Makefile targets of
- make dok, or alternately
- make redhat-dok. If you have problems,
- try both. The build process uses the document SGML sources in
+ make dok.
+ The build process uses the document SGML sources in
doc/source/*/* to update all text files in
doc/text/ and to update all HTML
documents in doc/webserver/.
@@ -385,9 +379,7 @@ Hal.
First, build the docs by running make
- dok (or alternately make
- redhat-dok). For PDF docs, do make
- dok-pdf.
+ dok.
Run make webserver which copies all
@@ -585,7 +577,7 @@ Hal.
Our documents are available in differing formats. Right now, they
- are just plain text, HTML, and PDF, but others are always a
+ are just plain text and/or HTML, but others are always a
future possibility. Be careful with URLs (<ulink>), and avoid
this mistake:
@@ -731,7 +723,7 @@ Hal.
understand why or what is being done. A reader may spend a lot
more time figuring out what is going on when a simple comment
or explanation would have prevented the extra research. Please
- help your brother IJB'ers out!
+ help your fellow Privoxy developers out!
The comments will also help justify the intent of the code.
If the comment describes something different than what the code
@@ -740,13 +732,13 @@ Hal.
Example:
/* if page size greater than 1k ... */
-if ( page_length() > 1024 )
+if (page_length() > 1024)
{
... "block" the page up ...
}
/* if page size is small, send it in blocks */
-if ( page_length() > 1024 )
+if (page_length() > 1024)
{
... "block" the page up ...
}
@@ -774,20 +766,20 @@ is actually being done.
/*********************************************************************
* This will stand out clearly in your code!
*********************************************************************/
-if ( this_variable == that_variable )
+if (this_variable == that_variable)
{
do_something_very_important();
}
/* unfortunately, this may not */
-if ( this_variable == that_variable )
+if (this_variable == that_variable)
{
do_something_very_important();
}
-if ( this_variable == that_variable ) /* this may not either */
+if (this_variable == that_variable) /* this may not either */
{
do_something_very_important();
}
@@ -821,12 +813,12 @@ if ( this_variable == that_variable ) /* this may not either */
* This will stand out clearly in your code,
* But the second example won't.
*********************************************************************/
-if ( this_variable == this_variable )
+if (this_variable == this_variable)
{
do_something_very_important();
}
-if ( this_variable == this_variable ) /*can you see me?*/
+if (this_variable == this_variable) /*can you see me?*/
{
do_something_very_important(); /*not easily*/
}
@@ -838,7 +830,7 @@ if ( this_variable == this_variable ) /*can you see me?*/
int urls_read = 0; /* # of urls read + rejected */
int urls_rejected = 0; /* # of urls rejected */
-if ( 1 == X )
+if (1 == X)
{
do_something_very_important();
}
@@ -915,7 +907,7 @@ short do_something_very_important(
Example:
-if ( 1 == X )
+if (1 == X)
{
do_something_very_important();
...some long list of commands...
@@ -923,11 +915,11 @@ if ( 1 == X )
or:
-if ( 1 == X )
+if (1 == X)
{
do_something_very_important();
...some long list of commands...
-} /* -END- if ( 1 == X ) */
+} /* -END- if (1 == X) */
@@ -977,14 +969,14 @@ int msiis5hack = 0; int msIis5Hack = 0;
Example:
-int load_some_file( struct client_state *csp )
+int load_some_file(struct client_state *csp)
Instead of:
-int loadsomefile( struct client_state *csp )
-int loadSomeFile( struct client_state *csp )
+int loadsomefile(struct client_state *csp)
+int loadSomeFile(struct client_state *csp)
@@ -1002,14 +994,14 @@ int loadSomeFile( struct client_state *csp )
Example:
-(.h) extern int load_aclfile( struct client_state *csp );
-(.c) int load_aclfile( struct client_state *csp )
+(.h) extern int load_aclfile(struct client_state *csp);
+(.c) int load_aclfile(struct client_state *csp)
Instead of:
-(.h) extern int load_aclfile( struct client_state * ); or
+(.h) extern int load_aclfile(struct client_state *); or
(.h) extern int load_aclfile();
-(.c) int load_aclfile( struct client_state *csp )
+(.c) int load_aclfile(struct client_state *csp)
@@ -1027,7 +1019,7 @@ int loadSomeFile( struct client_state *csp )
Example:
-(enumeration) : enum Boolean { FALSE, TRUE };
+(enumeration) : enum Boolean {FALSE, TRUE};
(#define) : #define DEFAULT_SIZE 100;
Note: We have a standard naming scheme for #defines
@@ -1095,18 +1087,18 @@ int loadSomeFile( struct client_state *csp )
Example:
-if ( this == that )
+if (this == that)
{
...
}
Instead of:
- if ( this == that ) { ... }
+ if (this == that) { ... }
or
- if ( this == that ) { ... }
+ if (this == that) { ... }
Note: In the special case that the if-statement is
inside a loop, and it is trivial, i.e. it tests for a
@@ -1118,12 +1110,12 @@ if ( this == that )
Example exception:
-while ( more lines are read )
+while (more lines are read)
{
/* Please document what is/is not a comment line here */
- if ( it's a comment ) continue;
+ if (it's a comment) continue;
- do_something( line );
+ do_something(line);
}
@@ -1140,7 +1132,7 @@ while ( more lines are read )
Example:
-if ( this == that )
+if (this == that)
{
do_something();
do_something_else();
@@ -1148,11 +1140,11 @@ if ( this == that )
Instead of:
- if ( this == that ) do_something(); do_something_else();
+ if (this == that) do_something(); do_something_else();
or
- if ( this == that ) do_something();
+ if (this == that) do_something();
Note: The first example in "Instead of" will execute
in a manner other than that which the developer desired (per
@@ -1169,11 +1161,11 @@ if ( this == that )
Example:
-structure->flag = ( condition );
+structure->flag = (condition);
Instead of:
- if ( condition ) { structure->flag = 1; } else {
+ if (condition) { structure->flag = 1; } else {
structure->flag = 0; }
Note: The former is readable and concise. The later
@@ -1199,10 +1191,6 @@ int first_value = 0;
int some_value = 0;
int another_value = 0;
int this_variable = 0;
-
-if ( this_variable == this_variable )
-
-first_value = old_value + ( ( some_value - another_value ) - whatever )
@@ -1241,19 +1229,19 @@ function_name();
int function1( ... )
{
...code...
- return( ret_code );
+ return(ret_code);
-} /* -END- function1 */
+} /* -END- function1 */
int function2( ... )
{
-} /* -END- function2 */
+} /* -END- function2 */
Instead of:
- int function1( ... ) { ...code... return( ret_code ); } int
+ int function1( ... ) { ...code... return(ret_code); } int
function2( ... ) { }
Note: Use 1 blank line before the closing brace and 2
@@ -1290,16 +1278,16 @@ static const char * const url_code_map[256] =
int function1( ... )
{
- if ( 1 )
+ if (1)
{
- return( ALWAYS_TRUE );
+ return ALWAYS_TRUE;
}
else
{
- return( HOW_DID_YOU_GET_HERE );
+ return HOW_DID_YOU_GET_HERE;
}
- return( NEVER_GETS_HERE );
+ return NEVER_GETS_HERE;
}
@@ -1384,7 +1372,7 @@ is_web_page_blank();
Example:
-for ( size_t cnt = 0; cnt < block_list_length(); cnt++ )
+for (size_t cnt = 0; cnt < block_list_length(); cnt++)
{
....
}
@@ -1407,7 +1395,7 @@ for ( size_t cnt = 0; cnt < block_list_length(); cnt++ )
size_t len = block_list_length();
-for ( size_t cnt = 0; cnt < len; cnt++ )
+for (size_t cnt = 0; cnt < len; cnt++)
{
....
}
@@ -1427,12 +1415,12 @@ for ( size_t cnt = 0; cnt < len; cnt++ )
This allows a developer to define a const pointer and call
your function. If your function does not have the const
keyword, we may not be able to use your function. Consider
- strcmp, if it were defined as: extern int strcmp( char *s1,
- char *s2 );
+ strcmp, if it were defined as: extern int strcmp(char *s1,
+ char *s2);
- I could then not use it to compare argv's in main: int main(
- int argc, const char *argv[] ) { strcmp( argv[0], "privoxy"
- ); }
+ I could then not use it to compare argv's in main: int
+ main(int argc, const char *argv[]) { strcmp(argv[0], "privoxy");
+ }
Both these pointers are *const*! If the c runtime library
maintainers do it, we should too.
@@ -1447,11 +1435,11 @@ for ( size_t cnt = 0; cnt < len; cnt++ )
Most structures cannot fit onto a normal stack entry (i.e.
they are not 4 bytes or less). Aka, a function declaration
- like: int load_aclfile( struct client_state csp )
+ like: int load_aclfile(struct client_state csp)
would not work. So, to be consistent, we should declare all
- prototypes with "pass by value": int load_aclfile( struct
- client_state *csp )
+ prototypes with "pass by value": int load_aclfile(struct
+ client_state *csp)
@@ -1594,22 +1582,22 @@ extern file_list *xyz;
Example:
-switch( hash_string( cmd ) )
+switch (hash_string(cmd))
{
- case hash_actions_file :
+ case hash_actions_file:
... code ...
break;
- case hash_confdir :
+ case hash_confdir:
... code ...
break;
- default :
+ default:
log_error( ... );
... anomaly code goes here ...
continue; / break; / exit( 1 ); / etc ...
-} /* end switch( hash_string( cmd ) ) */
+} /* end switch (hash_string(cmd)) */
Note: If you already have a default condition, you
are obviously exempt from this point. Of note, most of the
@@ -1649,24 +1637,6 @@ switch( hash_string( cmd ) )
necessary.
-
-
-
- Use 'long' or 'short' Instead of
- 'int'
-
- Explanation:
-
- On 32-bit platforms, int usually has the range of long. On
- 16-bit platforms, int has the range of short.
-
- Status: open-to-debate. In the case of most FSF
- projects (including X/GNU-Emacs), there are typedefs to int4,
- int8, int16, (or equivalence ... I forget the exact typedefs
- now). Should we add these to IJB now that we have a "configure"
- script?
-
-
@@ -1752,8 +1722,8 @@ list, then it should definitely be allocated via `malloc'.
Example:
-int load_re_filterfile( struct client_state *csp ) { ... }
-static void unload_re_filterfile( void *f ) { ... }
+int load_re_filterfile(struct client_state *csp) { ... }
+static void unload_re_filterfile(void *f) { ... }
Exceptions:
@@ -1788,7 +1758,7 @@ static void unload_re_filterfile( void *f ) { ... }
"Uncertain" new code and/or changes to
- existing code, use FIXME or XXX
+ existing code, use XXX
Explanation:
@@ -1796,18 +1766,18 @@ static void unload_re_filterfile( void *f ) { ... }
your changes, but are not *quite* sure of the repercussions,
add this:
- /* FIXME: this code has a logic error on platform XYZ, *
+ /* XXX: this code has a logic error on platform XYZ, *
attempting to fix */ #ifdef PLATFORM ...changed code here...
#endif
or:
- /* FIXME: I think the original author really meant this...
+ /* XXX: I think the original author really meant this...
*/ ...changed code here...
or:
- /* FIXME: new code that *may* break something else... */
+ /* XXX: new code that *may* break something else... */
...new code here...
Note: If you make it clear that this may or may not
@@ -1825,15 +1795,15 @@ static void unload_re_filterfile( void *f ) { ... }
Example for file comments:
-const char FILENAME_rcs[] = "$Id$";
+const char FILENAME_rcs[] = "$I<!-- Break CVS Substitution -->d$";
/*********************************************************************
*
- * File : $Source$
+ * File : $S<!-- Break CVS Substitution -->ource$
*
* Purpose : (Fill me in with a good description!)
*
* Copyright : Written by and Copyright (C) 2001-2009
- * the Privoxy team. http://www.privoxy.org/
+ * the Privoxy team. https://www.privoxy.org/
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -1879,15 +1849,15 @@ const char FILENAME_h_rcs[] = FILENAME_H_VERSION;
#ifndef _FILENAME_H
#define _FILENAME_H
-#define FILENAME_H_VERSION "$Id$"
+#define FILENAME_H_VERSION "$I<!-- Break CVS Substitution -->d$"
/*********************************************************************
*
- * File : $Source$
+ * File : $S<!-- Break CVS Substitution -->ource$
*
* Purpose : (Fill me in with a good description!)
*
* Copyright : Written by and Copyright (C) 2001-2009
- * the Privoxy team. http://www.privoxy.org/
+ * the Privoxy team. https://www.privoxy.org/
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -1953,10 +1923,10 @@ extern const char FILENAME_h_rcs[];
* Returns : 0 => Ok, everything else is an error.
*
*********************************************************************/
-int FUNCTION_NAME( void *param1, const char *x )
+int FUNCTION_NAME(void *param1, const char *x)
{
...
- return( 0 );
+ return 0;
}
@@ -2004,24 +1974,7 @@ Install the rpm. Any error messages?
-
-
- Test reports
-
-Please submit test reports only with the test form
-at sourceforge. Three simple steps:
-
-
- Select category: the distribution you test on.
- Select group: the version of Privoxy that we are about to release.
- Fill the Summary and Detailed Description with something
- intelligent (keep it short and precise).
-
-
- Do not mail to the mailing list (we cannot keep track on issues there).
-
-
-
+
@@ -2153,6 +2106,11 @@ at sourceforge. Three simple steps:
will need to be incremented as well.)
+
+
+ Update the code status (CODE_STATUS="xxx") to one of "alpha", "beta" or "stable".
+
+
If default.action has changed since last
@@ -2175,7 +2133,7 @@ at sourceforge. Three simple steps:
Finished docs should be then be committed to CVS (for those
without the ability to build these). Some docs may require
rather obscure processing tools. config,
- the man page (and the html version of the man page), and the PDF docs
+ the man page (and the html version of the man page)
fall in this category. REAMDE, the man page, AUTHORS, and config
should all also be committed to CVS for other packagers. The
formal docs should be uploaded to the webserver. See the
@@ -2454,7 +2412,7 @@ at sourceforge. Three simple steps:
be reset to one if this is the first RPM for
dist which is built from version
X.Y.Z. Check the
- file
+ file
list if unsure. Else, it must be set to the highest already available RPM
release number for that version plus one.
@@ -2588,9 +2546,9 @@ at sourceforge. Three simple steps:
Windows
- You should ensure you have the latest version of Cygwin (from
- http://www.cygwin.com/).
- Run the following commands from within a Cygwin bash shell.
+ Use the
+ Cygwin Time Machine to install the last 1.5 version of Cygwin.
+ Run the following commands from within the Cygwin 1.5 bash shell.
First, make sure that you have freshly exported the right
@@ -2753,7 +2711,7 @@ at sourceforge. Three simple steps:
The module contains complete instructions on its usage in its
- README file. The end result will be the the
+ README file. The end result will be the
exported version of Privoxy installed on the build machine.
@@ -2761,111 +2719,8 @@ at sourceforge. Three simple steps:
FreeBSD
- Login to Sourceforge's compile-farm via ssh:
-
-
-
- ssh cf.sourceforge.net
-
-
-
- Choose the right operating system.
- When logged in, make sure that you have freshly exported the right
- version into an empty directory. (See "Building and releasing
- packages" above). Then run:
-
-
-
- cd current
- autoheader && autoconf && ./configure
-
-
-
- Then run:
-
-
-
- gmake freebsd-dist
-
-
-
- which creates a gzip'ed tar archive. Sadly, you cannot use make
- freebsd-upload on the Sourceforge machine (no ncftpput). You now have
- to manually upload the archive to Sourceforge's ftp server and release
- the file publicly. Use the release notes and Change Log from the
- source tarball package.
-
-
-
- HP-UX 11
-
- First, make sure that you have freshly exported the right
- version into an empty directory. (See "Building and releasing
- packages" above). Then run:
-
-
-
- cd current
- autoheader && autoconf && ./configure
-
-
-
- Then do FIXME.
-
-
-
- Amiga OS
-
- First, make sure that you have freshly exported the right
- version into an empty directory. (See "Building and releasing
- packages" above). Then run:
-
-
-
- cd current
- autoheader && autoconf && ./configure
-
-
-
- Then do FIXME.
-
-
-
- AIX
-
- Login to Sourceforge's compilefarm via ssh:
-
-
-
- ssh cf.sourceforge.net
-
-
-
- Choose the right operating system.
- When logged in, make sure that you have freshly exported the right
- version into an empty directory. (See "Building and releasing
- packages" above). Then run:
-
-
-
- cd current
- autoheader && autoconf && ./configure
-
-
-
- Then run:
-
-
-
- make aix-dist
-
-
-
- which creates a gzip'ed tar archive. Sadly, you cannot use make
- aix-upload on the Sourceforge machine (no ncftpput). You now have
- to manually upload the archive to Sourceforge's ftp server and release
- the file publicly. Use the release notes and Change Log from the
- source tarball package.
+ Update the www/privoxy port and submit a diff upstream.
+ For details see the FreeBSD Porter's Handbook.
@@ -2932,10 +2787,10 @@ at sourceforge. Three simple steps:
After the Release
When all (or: most of the) packages have been uploaded and made available,
- send an email to the announce
+ send an email to the announce
mailing list, Subject: "Version X.Y.Z available for download". Be sure to
include the
- download
+ download
location, the release notes and the Changelog. Also, post an
updated News item on the project page Sourceforge, and update the Home
page and docs linked from the Home page (see below). Other news sites
@@ -2959,14 +2814,13 @@ at sourceforge. Three simple steps:
- make dok dok-pdf # (or 'make redhat-dok dok-pdf' if 'make dok' doesn't work for you)
+ make dok
That will generate doc/webserver/user-manual,
doc/webserver/developer-manual,
doc/webserver/faq,
- doc/pdf/*.pdf and
doc/webserver/index.html automatically.
@@ -2991,7 +2845,7 @@ at sourceforge. Three simple steps:
- This will do the upload to the
+ This will do the upload to the
webserver (www.privoxy.org) and ensure all files and directories
there are group writable.
@@ -3003,46 +2857,6 @@ at sourceforge. Three simple steps:
-
- Contacting the developers, Bug Reporting and Feature Requests
-
- &contacting;
-
-
-
-
-
-Privoxy Copyright, License and History
-
-
- ©right;
-
-
-
-License
-
- &license;
-
-
-
-
-
-History
-
- &history;
-
-
-
-
-
-
- See also
-
- &seealso;
-
-
-
-