X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=showargs.c;h=01c0bb337d0d3620dab434982da1dd585ec27dab;hp=a5b85b381f0a1c3be9d6156d32e460b8147491d8;hb=5d466a753172f0de9f6538e9cf88b6d62540e518;hpb=4793e1be2b24df19d6aa42a84b95653d040054f9

diff --git a/showargs.c b/showargs.c
index a5b85b38..01c0bb33 100644
--- a/showargs.c
+++ b/showargs.c
@@ -1,10 +1,11 @@
-const char showargs_rcs[] = "$Id: showargs.c,v 1.8 2001/05/29 09:50:24 jongfoster Exp $";
+const char showargs_rcs[] = "$Id: showargs.c,v 1.19 2001/07/13 14:04:09 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/showargs.c,v $
  *
  * Purpose     :  Contains various utility routines needed to 
  *                generate the show-proxy-args page.
+ *                FIXME: Is this really stuff for a separate file?
  *
  * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
  *                IJBSWA team.  http://ijbswa.sourceforge.net
@@ -33,6 +34,46 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.8 2001/05/29 09:50:24 jongfoste
  *
  * Revisions   :
  *    $Log: showargs.c,v $
+ *
+ *    Revision 1.18  2001/07/02 02:55:16  iwanttokeepanon
+ *    Apended " on some sites" to the HTML generating function `show_defines' (@ line
+ *    392); since "DENY_GZIP" is not *really* necessary for all PCRS functionallity.
+ *
+ *    Revision 1.17  2001/06/29 21:45:41  oes
+ *    Indentation, CRLF->LF, Tab-> Space
+ *
+ *    Revision 1.16  2001/06/29 13:35:07  oes
+ *    - Adapted
+ *    - Improved comments
+ *    - Removed init_proxy_args
+ *    - Renamed end_proxy_args(csp) to show_rcs(void)
+ *    - Removed logentry from cancelled commit
+ *    - Destroyed support for ndef SPLIT_PROXY_ARGS (Ooops)
+ *    - Separated the #define list into show_defines()
+ *
+ *    Revision 1.15  2001/06/09 10:55:28  jongfoster
+ *    Changing BUFSIZ ==> BUFFER_SIZE
+ *
+ *    Revision 1.14  2001/06/07 23:15:40  jongfoster
+ *    Removing config->proxy_args_gateways
+ *    Missing return statement added to end_proxy_args().
+ *
+ *    Revision 1.13  2001/06/06 09:37:59  sarantis
+ *    Fix misplaced comment start.
+ *
+ *    Revision 1.12  2001/06/04 10:41:52  swa
+ *    show version string of cgi.h and cgi.c
+ *
+ *    Revision 1.11  2001/06/03 11:03:48  oes
+ *    moved stuff to cgi.c
+ *
+ *    Revision 1.10  2001/05/31 21:36:07  jongfoster
+ *    Added RCS for actions.[ch] and list.[ch]
+ *
+ *    Revision 1.9  2001/05/29 23:11:38  oes
+ *
+ *     - Moved strsav() from showargs to miscutil
+ *
  *    Revision 1.8  2001/05/29 09:50:24  jongfoster
  *    Unified blocklist/imagelist/permissionslist.
  *    File format is still under discussion, but the internal changes
@@ -173,7 +214,7 @@ const char showargs_h_rcs[] = SHOWARGS_H_VERSION;
  *********************************************************************/
 void savearg(char *c, char *o, struct configuration_spec * config)
 {
-   char buf[BUFSIZ];
+   char buf[BUFFER_SIZE];
 
    *buf = '\0';
 
@@ -207,125 +248,32 @@ void savearg(char *c, char *o, struct configuration_spec * config)
 
    strcat(buf, "<br>\n");
 
-   config->proxy_args_invocation = strsav(config->proxy_args_invocation, buf);
-
-}
-
-
-/*********************************************************************
- *
- * Function    :  init_proxy_args
- *
- * Description :  Create the "top" of the show-proxy-args page.
- *
- * Parameters  :
- *          1  :  argc = argument count (same as in main)
- *          2  :  argv[] = program arguments (same as in main)
- *
- * Returns     :  N/A
- *
- *********************************************************************/
-void init_proxy_args(int argc, const char *argv[], struct configuration_spec * config)
-{
-   const struct gateway *g;
-   char * b;
-   int i;
-
-   freez(config->proxy_args_header);
-   freez(config->proxy_args_invocation);
-   freez(config->proxy_args_gateways);
-   freez(config->proxy_args_trailer);
-   
-
-   b = NULL;
-   b = strsav(b,
-      "HTTP/1.0 200 OK\n"
-      "Server: IJ/" VERSION "\n"
-      "Content-type: text/html\n\n"
-
-      "<html>"
-      "<head>"
-      "<title>Internet Junkbuster Proxy Status</title>"
-      "</head>\n"
-      "<body bgcolor=\"#f8f8f0\" link=\"#000078\" alink=\"#ff0022\" vlink=\"#787878\">\n"
-      "<center>\n"
-      "<h1>" BANNER "\n"
-      "<a href=\"" REDIRECT_URL "faq#show\">Proxy Status</a>\n"
-      "</h1></center>\n"
-      "<h2>You are using the " BANNER " <sup><small><small>TM</small></small></sup></h2>\n"
-      "Version: " VERSION "\n"
-      "<br>Home page: <a href=\"" HOME_PAGE_URL "\">" HOME_PAGE_URL "</a>\n"
-      "<p>\n"
-   );
-
-   b = strsav(b,
-      "<h2>The program was invoked as follows</h2>\n");
-
-   for (i=0; i < argc; i++)
-   {
-      b = strsav(b, argv[i]);
-      b = strsav(b, " ");
-   }
-   b = strsav(b, "<br>\n");
-
-   config->proxy_args_header = b;
-
-   config->proxy_args_invocation = strsav(
-      config->proxy_args_invocation,
-      "<br>\n"
-      "and the following options were set in the configuration file"
-      "<br><br>\n"
-   );
-
-   b = NULL;
-
-   b = strsav(b,
-      "<h2>It supports the following gateway protocols:</h2>\n");
-
-   for (g = gateways; g->name; g++)
-   {
-      b = strsav(b, g->name);
-      b = strsav(b, " ");
-   }
-   b = strsav(b, "<br>\n");
+   config->proxy_args = strsav(config->proxy_args, buf);
 
-   config->proxy_args_gateways = b;
 }
 
 
 /*********************************************************************
  *
- * Function    :  end_proxy_args
+ * Function    :  show_rcs
  *
- * Description :  Create the "bottom" of the show-proxy-args page.
+ * Description :  Create a string with the rcs info for all sourcefiles
  *
  * Parameters  :  None
  *
- * Returns     :  N/A
+ * Returns     :  string 
  *
  *********************************************************************/
-void end_proxy_args(struct configuration_spec * config)
+char *show_rcs(void)
 {
    char *b = NULL;
-   char buf[BUFSIZ];
+   char buf[BUFFER_SIZE];
 
    /* Instead of including *all* dot h's in the project (thus creating a
     * tremendous amount of dependencies), I will concede to declaring them
     * as extern's.  This forces the developer to add to this list, but oh well.
     */
 
-#ifndef SPLIT_PROXY_ARGS
-   if (suppress_blocklists && suppress_message!=NULL)
-   {
-      b = strsav(b, "<h2>File contents</h2>\n");
-      b = strsav(b, suppress_message);
-      b = strsav(b, "\n");
-   }
-#endif /* ndef SPLIT_PROXY_ARGS */
-
-   b = strsav(b, "<h2>Source versions:</h2>\n");
-   b = strsav(b, "<pre>");
-
 #define SHOW_RCS(__x)            \
    {                             \
       extern const char __x[];   \
@@ -334,9 +282,15 @@ void end_proxy_args(struct configuration_spec * config)
    }
 
    /* In alphabetical order */
+   SHOW_RCS(actions_h_rcs)
+   SHOW_RCS(actions_rcs)
+   SHOW_RCS(cgi_h_rcs)
+   SHOW_RCS(cgi_rcs)
 #ifdef __MINGW32__
    SHOW_RCS(cygwin_h_rcs)
 #endif
+   SHOW_RCS(deanimate_h_rcs)
+   SHOW_RCS(deanimate_rcs)
    SHOW_RCS(encode_h_rcs)
    SHOW_RCS(encode_rcs)
    SHOW_RCS(errlog_h_rcs)
@@ -357,6 +311,8 @@ void end_proxy_args(struct configuration_spec * config)
    SHOW_RCS(killpopup_h_rcs)
    SHOW_RCS(killpopup_rcs)
 #endif /* def KILLPOPUPS */
+   SHOW_RCS(list_h_rcs)
+   SHOW_RCS(list_rcs)
    SHOW_RCS(loadcfg_h_rcs)
    SHOW_RCS(loadcfg_rcs)
    SHOW_RCS(loaders_h_rcs)
@@ -365,10 +321,8 @@ void end_proxy_args(struct configuration_spec * config)
    SHOW_RCS(miscutil_rcs)
    SHOW_RCS(parsers_h_rcs)
    SHOW_RCS(parsers_rcs)
-#ifdef PCRS
    SHOW_RCS(pcrs_rcs)
    SHOW_RCS(pcrs_h_rcs)
-#endif /* def PCRS */
    SHOW_RCS(project_h_rcs)
    SHOW_RCS(showargs_h_rcs)
    SHOW_RCS(showargs_rcs)
@@ -390,9 +344,24 @@ void end_proxy_args(struct configuration_spec * config)
 
 #undef SHOW_RCS
 
-   b = strsav(b, "</pre>\n");
+   return(b);
+}
 
-   b = strsav(b, "<h2>Conditional defines:</h2>\n<ul>");
+/*********************************************************************
+ *
+ * Function    :  show_defines
+ *
+ * Description :  Create a string with all conditional #defines used
+ *                when building
+ *
+ * Parameters  :  None
+ *
+ * Returns     :  string 
+ *
+ *********************************************************************/
+char *show_defines(void)
+{
+   char *b = NULL;
 
 #ifdef REGEX
    b = strsav(b, "  <li><code>#define <b>REGEX</b></code> - Support for regular expressions in the path specs.</li>\n");
@@ -406,12 +375,6 @@ void end_proxy_args(struct configuration_spec * config)
    b = strsav(b, "  <li><code>#undef <b>PCRE</b></code> - Use old GNU regex library rather than PCRE.</li>\n");
 #endif /* ndef PCRE */
 
-#ifdef PCRS
-   b = strsav(b, "  <li><code>#define <b>PCRS</b></code> - Enables arbitrary content modification regexps.</li>\n");
-#else /* ifndef PCRS */
-   b = strsav(b, "  <li><code>#undef <b>PCRS</b></code> - Disables arbitrary content modification regexps.</li>\n");
-#endif /* ndef PCRS */
-
 #ifdef TOGGLE
    b = strsav(b, "  <li><code>#define <b>TOGGLE</b></code> - Allow JunkBuster to be \"disabled\" so it is just a normal non-blocking non-anonymizing proxy.</li>\n");
 #else /* ifndef TOGGLE */
@@ -425,7 +388,7 @@ void end_proxy_args(struct configuration_spec * config)
 #endif /* ndef FORCE_LOAD */
 
 #ifdef DENY_GZIP
-   b = strsav(b, "  <li><code>#define <b>DENY_GZIP</b></code> - Prevents requests from being compressed - required for PCRS.</li>\n");
+   b = strsav(b, "  <li><code>#define <b>DENY_GZIP</b></code> - Prevents requests from being compressed - required for PCRS on some sites.</li>\n");
 #else /* ifndef DENY_GZIP */
    b = strsav(b, "  <li><code>#undef <b>DENY_GZIP</b></code> - Allows requests to be compressed if the browser and server support it.</li>\n");
 #endif /* ndef DENY_GZIP */
@@ -488,24 +451,9 @@ void end_proxy_args(struct configuration_spec * config)
    b = strsav(b, "  <li><code>#define <b>FAST_REDIRECTS</b></code> - Enables intercepting remote script redirects.</li>\n");
 #else /* ifndef FAST_REDIRECTS */
    b = strsav(b, "  <li><code>#undef <b>FAST_REDIRECTS</b></code> - Disables intercepting remote script redirects.</li>\n");
-#endif  ndef /* FAST_REDIRECTS */
-
-   b = strsav(b, "</ul>\n<br>\n");
-
-   b = strsav(b,
-      "<small><small><p>\n"
-      "The " BANNER " Proxy - \n"
-      "<a href=\"" HOME_PAGE_URL "\">" HOME_PAGE_URL "</a><p>\n"
-      "Copyright &#169; 2001 <a href=\"" HOME_PAGE_URL "\">the SourceForge IJBSWA team</a><br>\n"
-      "Copyright &#169; 1997 <a href=\"http://www.junkbusters.com/\">\n" "Junkbusters Corporation</a><br>\n"
-      "Copying and distribution permitted under the "
-      "<a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU General Public License.</a>\n"
-      "</small></small>"
-      "</body></html>\n"
-   );
-
-   config->proxy_args_trailer = b;
+#endif /* ndef FAST_REDIRECTS */
 
+   return b;
 }