A few minor touch ups.

[privoxy.git] / cgisimple.c

diff --git a/cgisimple.c b/cgisimple.c
index 8cc9634..a985f47 100644 (file)
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.30 2002/04/24 02:18:08 oes Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.34 2002/04/30 12:06:12 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
@@ -36,6 +36,26 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.30 2002/04/24 02:18:08 oes Ex
  *
  * Revisions   :
  *    $Log: cgisimple.c,v $
+ *    Revision 1.34  2002/04/30 12:06:12  oes
+ *    Deleted unused code from default_cgi
+ *
+ *    Revision 1.33  2002/04/30 11:14:52  oes
+ *    Made csp the first parameter in *action_to_html
+ *
+ *    Revision 1.32  2002/04/26 18:29:13  jongfoster
+ *    Fixing this Visual C++ warning:
+ *    cgisimple.c(775) : warning C4018: '<' : signed/unsigned mismatch
+ *
+ *    Revision 1.31  2002/04/26 12:54:36  oes
+ *     - Kill obsolete REDIRECT_URL code
+ *     - Error handling fixes
+ *     - Style sheet related HTML snipplet changes
+ *     - cgi_show_url_info:
+ *       - Matches now in table, actions on single lines,
+ *         linked to help
+ *       - standard.action suppressed
+ *       - Buttons to View and Edit AFs
+ *
  *    Revision 1.30  2002/04/24 02:18:08  oes
  *     - show-status is now the starting point for editing
  *       the actions files, generate list of all AFs with buttons
@@ -199,8 +219,9 @@ static jb_err show_defines(struct map *exports);
  *
  * Function    :  cgi_default
  *
- * Description :  CGI function that is called if no action was given.
- *                Lists menu of available unhidden CGIs.
+ * Description :  CGI function that is called for the CGI_SITE_1_HOST
+ *                and CGI_SITE_2_HOST/CGI_SITE_2_PATH base URLs.
+ *                Boring - only exports the default exports.
  *               
  * Parameters  :
  *          1  :  csp = Current client state (buffers, headers, etc...)
@@ -211,57 +232,26 @@ static jb_err show_defines(struct map *exports);
  *
  * Returns     :  JB_ERR_OK on success
  *                JB_ERR_MEMORY on out-of-memory
- *                (Problems other than out-of-memory should be
- *                handled by this routine - it should set the
- *                rsp appropriately and return "success")
  *
  *********************************************************************/
 jb_err cgi_default(struct client_state *csp,
                    struct http_response *rsp,
                    const struct map *parameters)
 {
-   char *tmp;
    struct map *exports;
 
    assert(csp);
    assert(rsp);
-   assert(parameters);
 
    if (NULL == (exports = default_exports(csp, "")))
    {
       return JB_ERR_MEMORY;
    }
 
-   /* If there were other parameters, export a dump as "cgi-parameters" */
-   if (parameters->first)
-   {
-      tmp = strdup("<p>What made you think this cgi takes parameters?\n"
-                   "Anyway, here they are, in case you're interested:</p>\n");
-      string_join(&tmp, dump_map(parameters));
-      if (tmp == NULL)
-      {
-         free_map(exports);
-         return JB_ERR_MEMORY;
-      }
-      if (map(exports, "cgi-parameters", 1, tmp, 0))
-      {
-         return JB_ERR_MEMORY;
-      }
-   }
-   else
-   {
-      if (map(exports, "cgi-parameters", 1, "", 1))
-      {
-         return JB_ERR_MEMORY;
-      }
-   }
-
    return template_fill_for_cgi(csp, "default", exports, rsp);
 }
 
 
-
-
 /*********************************************************************
  *
  * Function    :  cgi_error_404
@@ -671,6 +661,7 @@ jb_err cgi_show_status(struct client_state *csp,
 {
    char *s = NULL;
    unsigned i;
+   int j;
 
    FILE * fp;
    char buf[BUFFER_SIZE];
@@ -762,9 +753,9 @@ jb_err cgi_show_status(struct client_state *csp,
    }
 
    s = strdup("");
-   for (i = 0; (s != NULL) && (i < Argc); i++)
+   for (j = 0; (s != NULL) && (j < Argc); j++)
    {
-      if (!err) err = string_join  (&s, html_encode(Argv[i]));
+      if (!err) err = string_join  (&s, html_encode(Argv[j]));
       if (!err) err = string_append(&s, " ");
    }
    if (!err) err = map(exports, "invocation", 1, s, 0);
@@ -1020,7 +1011,7 @@ jb_err cgi_show_url_info(struct client_state *csp,
 
       init_current_action(action);
 
-      if (map(exports, "default", 1, current_action_to_html(action, csp), 0))
+      if (map(exports, "default", 1, current_action_to_html(csp, action), 0))
       {
          free_current_action(action);
          free(url_param);
@@ -1101,7 +1092,7 @@ jb_err cgi_show_url_info(struct client_state *csp,
             if (url_match(b->url, url_to_query))
             {
                string_append(&matches, "<tr><td>{");
-               string_join  (&matches, actions_to_html(b->action, csp));
+               string_join  (&matches, actions_to_html(csp, b->action));
                string_append(&matches, " }</b><br>\n<code>");
                string_join  (&matches, html_encode(b->url->spec));
                string_append(&matches, "</code></td></tr>\n");
@@ -1141,7 +1132,7 @@ jb_err cgi_show_url_info(struct client_state *csp,
          return JB_ERR_MEMORY;
       }
 
-      s = current_action_to_html(action, csp);
+      s = current_action_to_html(csp, action);
 
       free_current_action(action);
 
@@ -1349,6 +1340,10 @@ static char *show_rcs(void)
    /* In alphabetical order */
    SHOW_RCS(actions_h_rcs)
    SHOW_RCS(actions_rcs)
+#ifdef AMIGA
+   SHOW_RCS(amiga_h_rcs)
+   SHOW_RCS(amiga_rcs)
+#endif /* def AMIGA */
    SHOW_RCS(cgi_h_rcs)
    SHOW_RCS(cgi_rcs)
 #ifdef FEATURE_CGI_EDIT_ACTIONS