* USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Log: wsh.c,v $
- * Revision 1.9 1996/01/09 10:46:51 adam
+ * Revision 1.12 1996/02/19 15:45:00 adam
+ * Sort of targets in multiple-targets selection.
+ *
+ * Revision 1.11 1996/02/12 10:10:32 adam
+ * Resource/config system used by the gateway.
+ *
+ * Revision 1.10 1996/01/12 10:05:22 adam
+ * If script name ends with ';' HTTP/GET/Expires will be defined.
+ * The cgi interface only reads final handshake if response from
+ * server (shell) was zero-terminated [If it isn't it probably died].
+ *
+ * Revision 1.9 1996/01/09 10:46:51 adam
* New defines: LOGDIR/EGWDIR/CGIDIR set in Makefile.
*
* Revision 1.8 1995/12/20 16:31:33 adam
#include <unistd.h>
#include <ctype.h>
+#include <sys/resource.h>
+#include <sys/time.h>
+
#include <gw-db.h>
+#include <gw-res.h>
#include "whtml.h"
#include "wtcl.h"
#include "wirtcl.h"
-#define TIMEOUT 60
-
static WCLIENT wcl;
static char *mod = "wsh";
int timeout;
W_Interp w_interp;
GW_DB gw_db;
+ GwRes shRes;
+#if 0
+ struct rlimit rlim;
+
+ rlim.rlim_cur = RLIM_INFINITY;
+ rlim.rlim_max = RLIM_INFINITY;
+ setrlimit (RLIMIT_CORE, &rlim);
+#endif
- chdir (EGWDIR);
gw_log_init (*argv);
- gw_log_file (GW_LOG_ALL, LOGDIR "/egwsh_log");
+ gw_log_file (GW_LOG_ALL, "egwsh_log");
+#if 0
gw_log_level (GW_LOG_ALL);
+#endif
gw_log (GW_LOG_STAT, mod, "Europagate www shell: %s", *argv);
-
- if (!(wcl = wproto_init()))
+ shRes = gw_res_init ();
+ gw_res_merge (shRes, "egw.res");
+ gw_res_merge (shRes, "shell.res");
+
+#if 1
+ gw_log_level (gw_log_mask_str (
+ gw_res_get (shRes, "log.level", "default")));
+#endif
+ if (!(wcl = wproto_init (gw_res_get (shRes, "fifo.dir", "/tmp/egw"))))
{
gw_log (GW_LOG_FATAL, mod, "init");
exit(1);
exit (1);
}
w_interp_load_state (w_interp, NULL);
- timeout = TIMEOUT;
+ timeout = atoi (gw_res_get (shRes, "timeout", "120"));
+ if (timeout < 1)
+ timeout = 1;
while (1)
{
char *p;
timeout = 10;
continue;
}
- timeout = TIMEOUT;
- wo_clear (wcl, "text/html");
+ timeout = atoi (gw_res_get (shRes, "timeout", "120"));
+ if (timeout < 1)
+ timeout = 1;
+ wo_clear (wcl, NULL);
strcpy (parms_buf, wcl->wf_parms);
script = parms = parms_buf;
while (*parms && *parms != '/')
*parms++ = '\0';
if (*script)
{
- p = script + strlen(script) - 1;
- while (*p && p != script)
+ p = script + strlen(script);
+ while (*--p && p != script)
switch (*p)
{
case '+':
wproto_cache (wcl, atoi(p+1));
*p = '\0';
break;
- default:
- --p;
+ case ';':
+ wo_printf (wcl, "Expires: %s\n", p[1] ? p+1 : "0");
+ gw_log (GW_LOG_DEBUG, mod, "Expires: %s", p[1] ?p+1:"0");
+ *p = '\0';
+ break;
}
}
+ wo_printf (wcl, "Content-type: text/html\n\n");
for (p = parms; *p; p++)
if (*p == '+')
*p = ' ';
- gw_log (GW_LOG_DEBUG, mod, "script: %s", script);
- gw_log (GW_LOG_DEBUG, mod, "parms: %s", parms);
+ gw_log (GW_LOG_STAT, mod, "script: %s", script);
+ gw_log (GW_LOG_STAT, mod, "parms: %s", parms);
if (w_interp_exec (w_interp, script, parms))
{
wo_printf (wcl, "<html><head><title>wsh error</title></head>\n");