The host parameter to connect_to() is now const.

[privoxy.git] / cgi.c

diff --git a/cgi.c b/cgi.c
index f461bb3..b101b2c 100644 (file)
--- a/cgi.c
+++ b/cgi.c
@@ -1,4 +1,4 @@
-const char cgi_rcs[] = "$Id: cgi.c,v 1.3 2001/06/03 19:12:16 oes Exp $";
+const char cgi_rcs[] = "$Id: cgi.c,v 1.5 2001/06/05 19:59:16 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgi.c,v $
@@ -36,6 +36,12 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.3 2001/06/03 19:12:16 oes Exp $";
  *
  * Revisions   :
  *    $Log: cgi.c,v $
+ *    Revision 1.5  2001/06/05 19:59:16  jongfoster
+ *    Fixing multiline character string (a GCC-only "feature"), and snprintf (it's _snprintf under VC++).
+ *
+ *    Revision 1.4  2001/06/04 10:41:52  swa
+ *    show version string of cgi.h and cgi.c
+ *
  *    Revision 1.3  2001/06/03 19:12:16  oes
  *    introduced new cgi handling
  *
@@ -106,6 +112,10 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.3 2001/06/03 19:12:16 oes Exp $";
 #include <ctype.h>
 #include <string.h>
 
+#ifdef _WIN32
+#define snprintf _snprintf
+#endif /* def _WIN32 */
+
 #include "project.h"
 #include "cgi.h"
 #include "list.h"
@@ -178,7 +188,7 @@ struct http_response *cgi_dispatch(struct client_state *csp)
       argstring = csp->http->path;
    }
    /* Or it's the host part of HOME_PAGE_URL ? */
-   else if (   (0 == strcmpic(csp->http->host, *&HOME_PAGE_URL + 7 ))
+   else if (   (0 == strcmpic(csp->http->host, HOME_PAGE_URL + 7 ))
             && (0 == strncmpic(csp->http->path,"/config", 7))
             && ((csp->http->path[7] == '/') || (csp->http->path[7] == '\0')))
    {
@@ -370,7 +380,7 @@ char *fill_template(struct client_state *csp, char *template, struct map *answer
    pcrs_job *job, *joblist = NULL;
    char buf[BUFSIZ];
    char *new, *old = NULL;
-   int error, size;
+   int size;
    FILE *fp;
 
    /*
@@ -515,8 +525,8 @@ int cgi_default(struct client_state *csp, struct http_response *rsp,
    if(parameters)
        {
       p = dump_map(parameters);
-          tmp = strsav(tmp, "<p>What made you think this cgi takes options?\n
-                         Anyway, here they are, in case you're interested:</p>\n");
+          tmp = strsav(tmp, "<p>What made you think this cgi takes options?\n"
+                        "Anyway, here they are, in case you're interested:</p>\n");
                tmp = strsav(tmp, p);
                exports = map(exports, "cgi-parameters", 1, tmp, 0);
       free(p);
@@ -642,9 +652,6 @@ int cgi_show_status(struct client_state *csp, struct http_response *rsp,
                     struct map *parameters)
 {
    char *s = NULL;
-   const struct gateway *g;
-   int i;
-
    struct map *exports = NULL;
 
 #ifdef SPLIT_PROXY_ARGS
@@ -665,23 +672,6 @@ int cgi_show_status(struct client_state *csp, struct http_response *rsp,
          file_description = "Actions List";
       }
       break;
-   case 'f':
-      if (csp->flist)
-      {
-         filename = csp->flist->filename;
-         file_description = "Forward List";
-      }
-      break;
-
-#ifdef ACL_FILES
-   case 'a':
-      if (csp->alist)
-      {
-         filename = csp->alist->filename;
-         file_description = "Access Control List";
-      }
-      break;
-#endif /* def ACL_FILES */
 
 #ifdef PCRS
    case 'r':
@@ -740,8 +730,6 @@ int cgi_show_status(struct client_state *csp, struct http_response *rsp,
    exports = map(exports, "version", 1, VERSION, 1);
    exports = map(exports, "home-page", 1, HOME_PAGE_URL, 1);
    exports = map(exports, "invocation-args", 1, csp->config->proxy_args_header, 1);
-   exports = map(exports, "gateways", 1, csp->config->proxy_args_gateways, 1);
-   exports = map(exports, "gateway-protocols", 1, s, 0);
 
 
 #ifdef STATISTICS
@@ -760,28 +748,6 @@ int cgi_show_status(struct client_state *csp, struct http_response *rsp,
           exports = map(exports, "actions-filename", 1, "None specified", 1);
        }
 
-   if (csp->flist)
-   {
-      exports = map(exports, "forward-filename", 1,  csp->flist->filename, 1);
-       }
-   else
-       {
-          exports = map(exports, "forward-filename", 1, "None specified", 1);
-       }
-
-#ifdef ACL_FILES
-   if (csp->alist)
-   {
-      exports = map(exports, "acl-filename", 1,  csp->alist->filename, 1);
-       }
-   else
-       {
-          exports = map(exports, "acl-filename", 1, "None specified", 1);
-       }
-#else
-   exports = map(exports, "acl-killer-start.*acl-killer-end", 1, "", 1);
-#endif /* ndef ACL_FILES */
-
 #ifdef PCRS
    if (csp->rlist)
    {
@@ -818,18 +784,6 @@ int cgi_show_status(struct client_state *csp, struct http_response *rsp,
       map(exports, "clist", 1, csp->clist->proxy_args , 1);
    }
 
-   if (csp->flist)
-   {
-      map(exports, "flist", 1, csp->flist->proxy_args , 1);
-       }
-
-#ifdef ACL_FILES
-   if (csp->alist)
-   {
-      map(exports, "alist", 1, csp->alist->proxy_args , 1);
-       }
-#endif /* def ACL_FILES */
-
 #ifdef PCRS
    if (csp->rlist)
    {