get the power of fcgi_config.h

[catagits/fcgi2.git] / examples / echo2.c

diff --git a/examples/echo2.c b/examples/echo2.c
index 950cccc..f40f725 100644 (file)
--- a/examples/echo2.c
+++ b/examples/echo2.c
@@ -1,7 +1,7 @@
-/* 
+/*
  * echo2.c --
  *
- *     Produce a page containing all the inputs (fcgiapp version)
+ *      Produce a page containing all the inputs (fcgiapp version)
  *
  *
  * Copyright (c) 1996 Open Market, Inc.
@@ -10,69 +10,74 @@
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  */
-
 #ifndef lint
-static const char rcsid[] = "$Id: echo2.c,v 1.1 1997/09/16 15:36:28 stanleyg Exp $";
+static const char rcsid[] = "$Id: echo2.c,v 1.6 1999/07/27 19:01:39 roberts Exp $";
 #endif /* not lint */
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "fcgiapp.h"
 
+#if defined HAVE_UNISTD_H || __linux__
+#include <unistd.h>
+#endif
+
+#include <stdlib.h>
+
 #ifdef _WIN32
 #include <process.h>
+#else
+extern char **environ;
 #endif
 
-void PrintEnv(FCGX_Stream *out, char *label, char **envp)
+static void PrintEnv(FCGX_Stream *out, char *label, char **envp)
 {
-    printf("%s:<br>\n<pre>\n", label);
     FCGX_FPrintF(out, "%s:<br>\n<pre>\n", label);
-    for(; *envp != NULL; envp++) {
+    for( ; *envp != NULL; envp++) {
         FCGX_FPrintF(out, "%s\n", *envp);
     }
     FCGX_FPrintF(out, "</pre><p>\n");
 }
 
-#ifndef _WIN32
-extern char **environ;
-#endif
-
-void main ()
+int main ()
 {
     FCGX_Stream *in, *out, *err;
     FCGX_ParamArray envp;
     int count = 0;
+
     while (FCGX_Accept(&in, &out, &err, &envp) >= 0) {
         char *contentLength = FCGX_GetParam("CONTENT_LENGTH", envp);
-        int len;
+        int len = 0;
+
         FCGX_FPrintF(out,
-               "Content-type: text/html\r\n"
-              "\r\n"
-              "<title>FastCGI echo (fcgiapp version)</title>"
-              "<h1>FastCGI echo (fcgiapp version)</h1>\n"
-               "Request number %d,  Process ID: %d<p>\n", ++count, 
-                     getpid());
-        if(contentLength != NULL) {
+           "Content-type: text/html\r\n"
+           "\r\n"
+           "<title>FastCGI echo (fcgiapp version)</title>"
+           "<h1>FastCGI echo (fcgiapp version)</h1>\n"
+           "Request number %d,  Process ID: %d<p>\n", ++count, getpid());
+
+        if (contentLength != NULL)
             len = strtol(contentLength, NULL, 10);
-        } else {
-            len = 0;
+
+        if (len <= 0) {
+            FCGX_FPrintF(out, "No data from standard input.<p>\n");
         }
-        if(len <= 0) {
-           FCGX_FPrintF(out, "No data from standard input.<p>\n");
-        } else {
+        else {
             int i, ch;
-           FCGX_FPrintF(out, "Standard input:<br>\n<pre>\n");
-            for(i = 0; i < len; i++) {
-                if((ch = FCGX_GetChar(in)) < 0) {
-                    FCGX_FPrintF(out, "Error: Not enough bytes received "
-                                      "on standard input<p>\n");
+
+            FCGX_FPrintF(out, "Standard input:<br>\n<pre>\n");
+            for (i = 0; i < len; i++) {
+                if ((ch = FCGX_GetChar(in)) < 0) {
+                    FCGX_FPrintF(out,
+                        "Error: Not enough bytes received on standard input<p>\n");
                     break;
-               }
+                }
                 FCGX_PutChar(ch, out);
             }
             FCGX_FPrintF(out, "\n</pre><p>\n");
         }
+
         PrintEnv(out, "Request environment", envp);
         PrintEnv(out, "Initial environment", environ);
     } /* while */
+
+    return 0;
 }