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

diff --git a/www/wcgi.c b/www/wcgi.c
index be3cb96..9653642 100644
--- a/www/wcgi.c
+++ b/www/wcgi.c
@@ -41,7 +41,22 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $Log: wcgi.c,v $
- * Revision 1.8  1995/11/08 16:14:35  adam
+ * Revision 1.12  1996/01/09 10:46:49  adam
+ * New defines: LOGDIR/EGWDIR/CGIDIR set in Makefile.
+ *
+ * Revision 1.11  1996/01/08  08:42:19  adam
+ * Handles method GET.
+ *
+ * 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.
+ *
+ * Revision 1.8  1995/11/08  16:14:35  adam
  * Many improvements and bug fixes.
  * First version that ran on dtbsun.
  *
@@ -88,8 +103,6 @@ the server, please reload the server's 'front page'."
 #include <gw-db.h>
 #include "wproto.h"
 
-#define CGIDIR "/usr/local/etc/httpd/cgi-bin"
-
 static char *prog = "cgi";
 
 static char serverp[256] = {'\0'};
@@ -133,6 +146,17 @@ static int spawn (char *sprog, int id)
     }
 }
 
+#if 0
+static void print_environ (void)
+{
+    extern char **environ;
+    int i;
+
+    for (i = 0; environ[i]; i++)
+        gw_log (GW_LOG_DEBUG, prog, "e: %s", environ[i]);
+}
+#endif
+
 /*
  * NOTE: In the (perhaps odd) terminology used within this software,
  * the 'server' is the present program, which is executed by the httpd
@@ -147,7 +171,7 @@ int main()
 
     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_file (GW_LOG_ALL, LOGDIR "/egwcgi_log");
     gw_log_level (GW_LOG_ALL);
     gw_log (GW_LOG_STAT, prog, "Europagate www cgi server");
 
@@ -184,7 +208,7 @@ int main()
     	path_info++;
     if (*path_info)
     	*(path_info++) = '\0';
-    if (!(gw_db = gw_db_open ("user.db", 1)))
+    if (!(gw_db = gw_db_open (EGWDIR "/www.db", 1, 1)))
     {
         gw_log (GW_LOG_FATAL, prog, "gw_db_open");
         exit (1);
@@ -262,6 +286,7 @@ int main()
     strcpy(p, serverp);
     p += strlen(p) + 1;
     strcpy(p, path_info);
+    gw_log (GW_LOG_DEBUG, prog, "P:%s", p);
     p += strlen(p) + 1;
     *(p++) = '\0';               /* no envvars tranferred at present */
     if ((t = getenv("CONTENT_LENGTH")) && (data = atoi(t)) > 0)
@@ -284,8 +309,14 @@ int main()
             i += j;
 	}
     }
-    p += data;
-    *(p++) = '\0';
+    else if ((t = getenv("QUERY_STRING")))
+    {
+        strcpy (p, t);
+        data = strlen(p);
+    }
+    p[data] = '\0';
+    gw_log (GW_LOG_DEBUG, prog, "C:%s", p);
+    p += data+1;
     data = (p - combuf);
     memcpy(combuf, &data, sizeof(data));
     gw_log (GW_LOG_DEBUG, prog, "Writing data");
@@ -294,10 +325,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");
 
@@ -305,6 +340,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");
@@ -316,6 +353,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);
@@ -389,6 +435,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);