X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jcc.c;h=ba0ecea999936b1c5ab80a048d9e7bed7dd10ce1;hp=e7d884008aebbbd29775fa0fe3cd419efdd67415;hb=53772b61ce552e1207450a5a5ec9e6a247de0b28;hpb=6157ccdeb4d417c8cf2df3c061632b4b4d4724c3

diff --git a/jcc.c b/jcc.c
index e7d88400..ba0ecea9 100644
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,3 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.469 2017/08/12 09:36:42 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -128,9 +127,6 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.469 2017/08/12 09:36:42 fabiankeil Exp $"
 #include "client-tags.h"
 #endif
 
-const char jcc_h_rcs[] = JCC_H_VERSION;
-const char project_h_rcs[] = PROJECT_H_VERSION;
-
 int daemon_mode = 1;
 struct client_states clients[1];
 struct file_list     files[1];
@@ -144,7 +140,7 @@ int urls_rejected = 0;     /* total nr of urls rejected */
 int g_terminate = 0;
 #endif
 
-#if !defined(_WIN32) && !defined(__OS2__) && !defined(AMIGA)
+#if !defined(_WIN32) && !defined(__OS2__)
 static void sig_handler(int the_signal);
 #endif
 static int client_protocol_is_unsupported(const struct client_state *csp, char *req);
@@ -167,12 +163,7 @@ static jb_socket bind_port_helper(const char *haddr, int hport, int backlog);
 static void bind_ports_helper(struct configuration_spec *config, jb_socket sockets[]);
 static void close_ports_helper(jb_socket sockets[]);
 static void listen_loop(void);
-
-#ifdef AMIGA
-void serve(struct client_state *csp);
-#else /* ifndef AMIGA */
 static void serve(struct client_state *csp);
-#endif /* def AMIGA */
 
 #ifdef __BEOS__
 static int32 server_thread(void *data);
@@ -343,7 +334,7 @@ static const struct cruncher crunchers_light[] = {
  *
  * here?
  */
-#if !defined(_WIN32) && !defined(__OS2__) && !defined(AMIGA)
+#if !defined(_WIN32) && !defined(__OS2__)
 /*********************************************************************
  *
  * Function    :  sig_handler
@@ -762,7 +753,7 @@ static void log_applied_actions(const struct current_action_spec *actions)
  *
  * Parameters  :
  *          1  :  csp = Current client state (buffers, headers, etc...)
- *          1  :  rsp = Fully prepared response. Will be freed on exit.
+ *          2  :  rsp = Fully prepared response. Will be freed on exit.
  *
  * Returns     :  Nothing.
  *
@@ -1069,7 +1060,7 @@ static void wait_for_alive_connections(void)
  *          1  :  sfd  = Open socket to remember.
  *          2  :  http = The destination for the connection.
  *          3  :  fwd  = The forwarder settings used.
- *          3  :  server_connection  = storage.
+ *          4  :  server_connection  = storage.
  *
  * Returns     : void
  *
@@ -2173,7 +2164,7 @@ static void handle_established_connection(struct client_state *csp)
                 */
                watch_client_socket = 0;
                log_error(LOG_LEVEL_CONNECT,
-                  "Stopping to watch the client socket %d. "
+                  "Stop watching client socket %d. "
                   "There's already another request waiting.",
                   csp->cfd);
                continue;
@@ -3170,11 +3161,7 @@ static void prepare_csp_for_next_request(struct client_state *csp)
  * Returns     :  N/A
  *
  *********************************************************************/
-#ifdef AMIGA
-void serve(struct client_state *csp)
-#else /* ifndef AMIGA */
 static void serve(struct client_state *csp)
-#endif /* def AMIGA */
 {
    int config_file_change_detected = 0; /* Only used for debugging */
 #ifdef FEATURE_CONNECTION_KEEP_ALIVE
@@ -3819,9 +3806,7 @@ int main(int argc, char **argv)
    clients->next = NULL;
 
    /* XXX: factor out initialising after the next stable release. */
-#ifdef AMIGA
-   InitAmiga();
-#elif defined(_WIN32)
+#ifdef _WIN32
    InitWin32();
 #endif
 
@@ -3844,7 +3829,7 @@ int main(int argc, char **argv)
     * are handled when and where they occur without relying
     * on a signal.
     */
-#if !defined(_WIN32) && !defined(__OS2__) && !defined(AMIGA)
+#if !defined(_WIN32) && !defined(__OS2__)
 {
    int idx;
    const int catched_signals[] = { SIGTERM, SIGINT, SIGHUP };
@@ -4306,12 +4291,12 @@ static void listen_loop(void)
    for (;;)
 #endif
    {
-#if !defined(FEATURE_PTHREAD) && !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__)
+#if !defined(FEATURE_PTHREAD) && !defined(_WIN32) && !defined(__BEOS__) && !defined(__OS2__)
       while (waitpid(-1, NULL, WNOHANG) > 0)
       {
          /* zombie children */
       }
-#endif /* !defined(FEATURE_PTHREAD) && !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */
+#endif /* !defined(FEATURE_PTHREAD) && !defined(_WIN32) && !defined(__BEOS__) */
 
       /*
        * Free data that was used by died threads
@@ -4348,13 +4333,6 @@ static void listen_loop(void)
       if (!accept_connection(csp, bfds))
       {
          log_error(LOG_LEVEL_CONNECT, "accept failed: %E");
-
-#ifdef AMIGA
-         if (!childs)
-         {
-            exit(1);
-         }
-#endif
          freez(csp_list);
          continue;
       }
@@ -4483,34 +4461,6 @@ static void listen_loop(void)
          }
 #endif
 
-#if defined(AMIGA) && !defined(SELECTED_ONE_OPTION)
-#define SELECTED_ONE_OPTION
-         csp->cfd = ReleaseSocket(csp->cfd, -1);
-
-#ifdef __amigaos4__
-         child_id = (int)CreateNewProcTags(NP_Entry, (ULONG)server_thread,
-                                           NP_Output, Output(),
-                                           NP_CloseOutput, FALSE,
-                                           NP_Name, (ULONG)"privoxy child",
-                                           NP_Child, TRUE,
-                                           TAG_DONE);
-#else
-         child_id = (int)CreateNewProcTags(NP_Entry, (ULONG)server_thread,
-                                           NP_Output, Output(),
-                                           NP_CloseOutput, FALSE,
-                                           NP_Name, (ULONG)"privoxy child",
-                                           NP_StackSize, 200*1024,
-                                           TAG_DONE);
-#endif
-         if (0 != child_id)
-         {
-            childs++;
-            ((struct Task *)child_id)->tc_UserData = csp;
-            Signal((struct Task *)child_id, SIGF_SINGLE);
-            Wait(SIGF_SINGLE);
-         }
-#endif
-
 #if !defined(SELECTED_ONE_OPTION)
          child_id = fork();