Readable detailed presentation format as well as raw format.

[egate.git] / www / wcgi.c

diff --git a/www/wcgi.c b/www/wcgi.c
index 0d55ccb..be3cb96 100644 (file)
--- a/www/wcgi.c
+++ b/www/wcgi.c
@@ -41,7 +41,15 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $Log: wcgi.c,v $
- * Revision 1.6  1995/11/06 17:44:22  adam
+ * Revision 1.8  1995/11/08 16:14:35  adam
+ * Many improvements and bug fixes.
+ * First version that ran on dtbsun.
+ *
+ * Revision 1.7  1995/11/08  12:42:18  adam
+ * Added descriptive text field in target info.
+ * Added authentication field in target info.
+ *
+ * Revision 1.6  1995/11/06  17:44:22  adam
  * State reestablised when shell restarts. History of previous
  * result sets.
  *
@@ -115,6 +123,7 @@ static int spawn (char *sprog, int id)
        case 0: 
             close (0);
             close (1);
+           close (2);
             gw_log (GW_LOG_DEBUG, prog, "execl %s", path);
             execl (path, sprog, 0); 
             gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "execl %s", path);
@@ -136,6 +145,7 @@ int main()
     char combuf[COMBUF];
     int linein = -1, lineout, data, gw_id;
 
+    chdir ("/usr/local/etc/httpd/cgi-bin");
     gw_log_init ("egw");
     gw_log_file (GW_LOG_ALL, "/usr/local/etc/httpd/logs/egwcgi_log");
     gw_log_level (GW_LOG_ALL);
@@ -256,10 +266,22 @@ int main()
     *(p++) = '\0';               /* no envvars tranferred at present */
     if ((t = getenv("CONTENT_LENGTH")) && (data = atoi(t)) > 0)
     {
-       if (read(0, p, data) < data)
-       {
-           gw_log (GW_LOG_FATAL, prog, "Failed to read input");
-           fatal("Internal error in server");
+        int j, i = 0;
+        while (i < data)
+        {
+           j = read(0, p + i, data - i);
+            if (j == -1)
+            {
+               gw_log (GW_LOG_ERRNO|GW_LOG_FATAL, prog,
+                        "Failed to read input");
+               fatal("Internal error in server");
+            }
+            else if (j == 0)
+            {
+               gw_log (GW_LOG_ERRNO, prog, "Failed to read input");
+               fatal("Internal error in server");
+            }
+            i += j;
        }
     }
     p += data;
@@ -279,7 +301,7 @@ int main()
     }
     gw_log (GW_LOG_DEBUG, prog, "Reading response");
 
-#if 0
+#if 1
     while ((data = read(linein, combuf, COMBUF)) > 0)
     {
         gw_log (GW_LOG_DEBUG, prog, "Got %d bytes", data);
@@ -295,7 +317,7 @@ int main()
         exit (1);
     }
 #else
-#  if 0
+#  if 1
     fcntl (linein, F_SETFL, O_NONBLOCK);
 #  endif
     while (1)