Bug fix: shell (wproto) sometimes closed server FIFO before cgi

[egate.git] / www / wcgi.c

diff --git a/www/wcgi.c b/www/wcgi.c
index 06b8ace..a94c5ff 100644 (file)
--- a/www/wcgi.c
+++ b/www/wcgi.c
@@ -41,7 +41,11 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $Log: wcgi.c,v $
- * Revision 1.9  1995/12/20 16:31:33  adam
+ * Revision 1.10  1996/01/05 16:21:20  adam
+ * Bug fix: shell (wproto) sometimes closed server FIFO before cgi
+ * program opened it - solution: cgi sends OK when response has been read.
+ *
+ * Revision 1.9  1995/12/20  16:31:33  adam
  * Bug fix: shell might terminate even though new request was initiated
  * by the cgi interface program.
  * Work on more simple user interface and Europagate buttons.
@@ -299,10 +303,14 @@ int main()
        gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "write");
        fatal("Internal server error");
     }
-    if (linein < 0 && (linein = open(serverp, O_RDONLY)) < 0)
+    if (linein < 0)
     {
-       gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "open %s", serverp);
-       fatal("Internal error in server");
+        gw_log (GW_LOG_DEBUG, prog, "open %s", serverp);
+        if ((linein = open(serverp, O_RDONLY)) < 0)
+        {
+            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");
 
@@ -310,6 +318,8 @@ int main()
     while ((data = read(linein, combuf, COMBUF)) > 0)
     {
         gw_log (GW_LOG_DEBUG, prog, "Got %d bytes", data);
+       if (combuf[data-1] == '\0')
+            break;
         if (write(1, combuf, data) < data)
         {
             gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "write");
@@ -321,6 +331,15 @@ int main()
        gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "read");
         exit (1);
     }
+    if (data > 0)
+    {
+        --data;
+        if (write(1, combuf, data) < data)
+        {
+            gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "write");
+            exit (1);
+        }
+    }
 #else
 #  if 1
     fcntl (linein, F_SETFL, O_NONBLOCK);
@@ -394,6 +413,12 @@ int main()
         }
     }
 #endif
+
+#if 1
+    gw_log (GW_LOG_DEBUG, prog, "writing ack");
+    if (write(lineout, "OK", 2) < 2)
+       gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "write");
+#endif
     gw_log (GW_LOG_DEBUG, prog, "Cleaning up.");
     close(linein);
     unlink(serverp);