* USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Log: wproto.c,v $
- * Revision 1.17 1996/01/26 09:02:22 adam
+ * Revision 1.22 1997/01/24 13:13:11 adam
+ * Implemnted egw_source and added a "raw" option to the URL.
+ * Fixed a bug in the buffering system of wproto; the macro wo_putc could
+ * override memory if it was the first HTML generating function called.
+ *
+ * Revision 1.21 1996/05/23 15:53:11 adam
+ * Bug fix: egw_enc failed on 8-bit chars.
+ * New command: egw_parms.
+ *
+ * Revision 1.20 1996/05/21 14:53:04 adam
+ * Tcl command wform extented; options -raw and -exists added.
+ *
+ * Revision 1.19 1996/03/14 11:48:39 adam
+ * New function egw_prog that returns name of shell.
+ *
+ * Revision 1.18 1996/02/12 10:09:23 adam
+ * New parameter to wproto_init: directory root for the FIFOs (instead
+ * of using preprocessor defines FIFODIR/FIFOROOT).
+ *
+ * Revision 1.17 1996/01/26 09:02:22 adam
* Open of client FIFO called with O_NDELAY when reconnecting to shell
* in order to prevent serious lock if previous shell died without
* unlinking client FIFO.
#include <stdarg.h>
#include <ctype.h>
#include <errno.h>
+#include <assert.h>
#include "wproto.h"
{
if (wc->outbuffer_offset + len >= wc->outbuffer_size)
{
- if (!wc->outbuffer)
- wc->outbuffer = malloc (wc->outbuffer_size +=
- ((len >= OUTBUFFER_CHUNK) ? len*2 : OUTBUFFER_CHUNK));
- else
- wc->outbuffer = realloc(wc->outbuffer, wc->outbuffer_size +=
- ((len >= OUTBUFFER_CHUNK) ? len*2 : OUTBUFFER_CHUNK));
+ assert (wc->outbuffer);
+ wc->outbuffer = realloc(wc->outbuffer, wc->outbuffer_size +=
+ ((len >= OUTBUFFER_CHUNK) ? len*2 : OUTBUFFER_CHUNK));
}
memcpy(wc->outbuffer + wc->outbuffer_offset, s, len);
wc->outbuffer_offset += len;
void wo_clear (WCLIENT wc, const char *type)
{
+ if (!wc->outbuffer)
+ wc->outbuffer = malloc (wc->outbuffer_size = OUTBUFFER_CHUNK);
wc->outbuffer_offset = 0;
if (type)
wo_printf(wc, "Content-type: %s\n\n", type);
if (rs == 0)
{
gw_log (GW_LOG_STAT, mod,
- "wproto_process returning 0 after %d second timeout.",
+ "select %d second timeout.",
timeout);
unlink (wc->wf_serverp);
return 0;
p++;
for (t = wc->wf_serverf; (*t = *p); t++, p++);
p++;
+ for (t = wc->wf_script; *p && *p != '/'; t++, p++)
+ *t = *p;
+ *t = '\0';
+ if (*p)
+ p++;
+ decode_form (wc->wf_parms_var, p);
for (t = wc->wf_parms; (*t = *p); t++, p++);
p++;
p++; /* we don't deal with envvars yet */
+ wc->raw_data = p;
decode_form(wc->wf_data, p);
if (wc->lineout < 0)
{
}
}
-WCLIENT wproto_init(void)
+WCLIENT wproto_init (const char *fifoDir, const char *prog)
{
char *val, path2[256];
wclient_data *new;
gw_log (GW_LOG_FATAL, mod, "GWID not set");
exit (1);
}
+ if (!(new->prog = malloc (strlen(prog)+1)))
+ {
+ gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "malloc");
+ exit (1);
+ }
+ strcpy (new->prog, prog);
+ new->fifoDir = fifoDir;
new->id = atoi (val);
- sprintf(new->path, "%s/%s/clt%d", FIFOROOT, FIFODIR, new->id);
+ sprintf(new->path, "%s/clt%d", new->fifoDir, new->id);
if (mkfifo(new->path, 0666 | S_IFIFO) < 0)
gw_log (GW_LOG_WARN|GW_LOG_ERRNO, mod, "mkfifo(%s)", new->path);
gw_log (GW_LOG_DEBUG, mod, "Synchronizing with server.");
- sprintf(path2, "%s/%s/srv%d", FIFOROOT, FIFODIR, getppid());
+ sprintf(path2, "%s/srv%d", new->fifoDir, getppid());
if ((new->lineout = open(path2, O_WRONLY)) < 0)
{
gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "open out %s", path2);
void wproto_terminate(WCLIENT wc)
{
+ free (wc->prog);
close(wc->linein);
unlink(wc->path);
wproto_uncache(wc, 0);
}
wproto_uncache(wc, level);
p = &wc->cache[++wc->cache_level];
- sprintf(p->path, "%s/%s/csh%d.%d", FIFOROOT, FIFODIR, wc->id, level);
+ sprintf(p->path, "%s/csh%d.%d", wc->fifoDir, wc->id, level);
if ((wc->cache_fd = open(p->path, O_WRONLY|O_CREAT|O_TRUNC, 0600)) < 0)
{
gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "open %s", p->path);