X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fwcgi.c;h=be3cb9654936ec9098943162c241d1cae0c32fdd;hb=b443634fbd412cea15ea527188c3e241bb1edf21;hp=d2b915de31ff9f76e43680451d42134a0c695923;hpb=71b5b2cf0d923cf64e9353c9250bd2912e446e0a;p=egate.git

diff --git a/www/wcgi.c b/www/wcgi.c
index d2b915d..be3cb96 100644
--- a/www/wcgi.c
+++ b/www/wcgi.c
@@ -41,7 +41,19 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $Log: wcgi.c,v $
- * Revision 1.5  1995/11/06 10:51:15  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.
+ *
+ * Revision 1.5  1995/11/06  10:51:15  adam
  * End of response marker in response from wsh/wproto to wcgi.
  * Shells are respawned when necessary.
  *
@@ -111,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);
@@ -132,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);
@@ -195,15 +209,15 @@ int main()
     	gw_log (GW_LOG_DEBUG, prog, "Synchronizing with client");
 	if ((linein = open(serverp, O_RDONLY)) < 0)
 	{
-	    gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "open server %s", serverp);
+	    gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "open %s", serverp);
 	    fatal("Internal error in server.");
 	}
 	if (read(linein, combuf, 2) < 2 || strcmp(combuf, "OK"))
 	{
-	    gw_log (GW_LOG_FATAL, prog, "Failed to synchronize with client.");
+	    gw_log (GW_LOG_FATAL, prog, "Failed to synchronize with client");
 	    fatal("Internal error in server");
 	}
-    	gw_log (GW_LOG_DEBUG, prog, "Synchronized.");
+    	gw_log (GW_LOG_DEBUG, prog, "Synchronized");
     }
     sprintf(clientp, "%s/clt%d", tmp, gw_id);
     gw_log (GW_LOG_DEBUG, prog, "Opening %s", clientp);
@@ -227,7 +241,7 @@ int main()
     	gw_log (GW_LOG_DEBUG, prog, "Synchronizing with client");
 	if ((linein = open(serverp, O_RDONLY)) < 0)
 	{
-	    gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "open server %s", serverp);
+	    gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "open %s", serverp);
 	    fatal("Internal error in server");
 	}
 	if (read(linein, combuf, 2) < 2 || strcmp(combuf, "OK"))
@@ -239,12 +253,11 @@ int main()
         if ((lineout = open(clientp, O_WRONLY)) < 0)
         {
     	    gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "%s", clientp);
-            gw_db_close (gw_db);
-            exit (1);
+	    fatal("Internal error in server");
         }
     }
     gw_db_close (gw_db);
-    gw_log (GW_LOG_DEBUG, prog, "Decoding user data.");
+    gw_log (GW_LOG_DEBUG, prog, "Decoding user data");
     p = combuf + sizeof(data);
     strcpy(p, serverp);
     p += strlen(p) + 1;
@@ -253,30 +266,42 @@ 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;
     *(p++) = '\0';
     data = (p - combuf);
     memcpy(combuf, &data, sizeof(data));
-    gw_log (GW_LOG_DEBUG, prog, "Writing data.");
+    gw_log (GW_LOG_DEBUG, prog, "Writing data");
     if (write(lineout, combuf, data) < data)
     {
     	gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "write");
-    	fatal("Internal server error.");
+    	fatal("Internal server error");
     }
     if (linein < 0 && (linein = open(serverp, O_RDONLY)) < 0)
     {
-	gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "open server %s", serverp);
-	fatal("Internal error in server.");
+	gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "open %s", serverp);
+	fatal("Internal error in server");
     }
-    gw_log (GW_LOG_DEBUG, prog, "Reading response.");
+    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);
@@ -292,7 +317,7 @@ int main()
         exit (1);
     }
 #else
-#  if 0
+#  if 1
     fcntl (linein, F_SETFL, O_NONBLOCK);
 #  endif
     while (1)
@@ -349,8 +374,18 @@ int main()
             break;
         if (r > 0 && FD_ISSET (1, &s_input))
         {
-            gw_log (GW_LOG_DEBUG, prog, "stdout closed");
-            break;
+            data = read (1, combuf, COMBUF);
+            if (data == -1)
+            {
+                gw_log (GW_LOG_DEBUG|GW_LOG_ERRNO, prog, "stdout closed");
+                break;
+            }
+            if (data == 0)
+            {
+                gw_log (GW_LOG_DEBUG, prog, "stdout closed");
+                break;
+            }
+            gw_log (GW_LOG_DEBUG, prog, "stdout got %d bytes", data);
         }
     }
 #endif