X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fwproto.c;h=992d8007e421db03cab4d563f246888cb85ab95e;hb=a99bbcafcacb3b34d19e2ccef4ee636dfbe883e1;hp=62448aad0e079f7d6dfec26daa149131bc83fb31;hpb=5e3100c03c68fd3192bbcef8de7c3b9488b4d3c3;p=egate.git
diff --git a/www/wproto.c b/www/wproto.c
index 62448aa..992d800 100644
--- a/www/wproto.c
+++ b/www/wproto.c
@@ -41,6 +41,14 @@
* USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Log: wproto.c,v $
+ * Revision 1.24 1997/01/31 11:16:00 adam
+ * Enhanced the egw_source command. An optional parameter specifies the
+ * name of a variable in which the HTML output is stored.
+ *
+ * Revision 1.23 1997/01/27 11:27:14 adam
+ * Implemented a new command, egw_clear, to clear http output cache.
+ * Changed prototype for function wo_clear.
+ *
* 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
@@ -152,14 +160,17 @@ static void wproto_uncache(WCLIENT wc, int level);
static char *mod = "wproto";
+void wo_expand (WCLIENT wc, size_t len)
+{
+ assert (wc->outbuffer);
+ wc->outbuffer = realloc(wc->outbuffer, wc->outbuffer_size +=
+ ((len >= OUTBUFFER_CHUNK) ? len*2 : OUTBUFFER_CHUNK));
+}
+
void wo_write (WCLIENT wc, const char *s, size_t len)
{
if (wc->outbuffer_offset + len >= wc->outbuffer_size)
- {
- assert (wc->outbuffer);
- wc->outbuffer = realloc(wc->outbuffer, wc->outbuffer_size +=
- ((len >= OUTBUFFER_CHUNK) ? len*2 : OUTBUFFER_CHUNK));
- }
+ wo_expand (wc, len);
memcpy(wc->outbuffer + wc->outbuffer_offset, s, len);
wc->outbuffer_offset += len;
}
@@ -180,36 +191,11 @@ void wo_printf (WCLIENT wc, const char *fmt, ...)
va_end(ap);
}
-void wo_clear (WCLIENT wc, const char *type)
+void wo_clear (WCLIENT wc)
{
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);
-}
-
-int wo_puthtml (WCLIENT wc, char *name)
-{
- FILE *f;
- char ch;
-
- wo_clear(wc, "text/html");
- if (!(f = fopen(name, "r")))
- {
- wo_printf(wc, "
Failed to open file: %s
", name);
- return 0;
- }
- while (ch = getc(f), !feof(f))
- {
- if (wo_putc(wc, ch) < 0)
- {
- fclose(f);
- return -1;
- }
- }
- fclose(f);
- return 0;
}
int wo_flush(WCLIENT wc)
@@ -252,7 +238,9 @@ int wo_flush(WCLIENT wc)
int wo_overflow(WCLIENT wc, char ch)
{
gw_log (GW_LOG_DEBUG, mod, "wo_overflow");
- if (wo_flush(wc) < 0)
+ if (wc->save_level)
+ wo_expand (wc, 0);
+ else if (wo_flush(wc) < 0)
return -1;
return wo_putc(wc, ch);
}
@@ -443,11 +431,11 @@ int wproto_process(WCLIENT wc, int timeout)
WCLIENT wproto_init (const char *fifoDir, const char *prog)
{
char *val, path2[256];
- wclient_data *new;
+ wclient_data *newp;
gw_log (GW_LOG_DEBUG, mod, "wproto_init");
close(1); /* release us from the wserver */
- if (!(new = malloc(sizeof(*new))))
+ if (!(newp = malloc(sizeof(*newp))))
{
gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "malloc");
exit (1);
@@ -457,49 +445,50 @@ WCLIENT wproto_init (const char *fifoDir, const char *prog)
gw_log (GW_LOG_FATAL, mod, "GWID not set");
exit (1);
}
- if (!(new->prog = malloc (strlen(prog)+1)))
+ if (!(newp->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/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);
+ strcpy (newp->prog, prog);
+ newp->fifoDir = fifoDir;
+ newp->id = atoi (val);
+ sprintf(newp->path, "%s/clt%d", newp->fifoDir, newp->id);
+ if (mkfifo(newp->path, 0666 | S_IFIFO) < 0)
+ gw_log (GW_LOG_WARN|GW_LOG_ERRNO, mod, "mkfifo(%s)", newp->path);
gw_log (GW_LOG_DEBUG, mod, "Synchronizing with server.");
- sprintf(path2, "%s/srv%d", new->fifoDir, getppid());
- if ((new->lineout = open(path2, O_WRONLY)) < 0)
+ sprintf(path2, "%s/srv%d", newp->fifoDir, getppid());
+ if ((newp->lineout = open(path2, O_WRONLY)) < 0)
{
gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "open out %s", path2);
exit(1);
}
- if (write(new->lineout, "OK", 2) < 2)
+ if (write(newp->lineout, "OK", 2) < 2)
{
gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "write");
exit(1);
}
gw_log (GW_LOG_DEBUG, mod, "Synchronized.");
- if ((new->linein = open(new->path, O_RDONLY)) < 0)
+ if ((newp->linein = open(newp->path, O_RDONLY)) < 0)
{
- gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "open input %s", new->path);
+ gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "open input %s", newp->path);
exit(1);
}
gw_log (GW_LOG_DEBUG, mod, "init. linein=%d lineout=%d",
- new->linein, new->lineout);
+ newp->linein, newp->lineout);
/* we put a handle on this so we get a blocking read when no peer */
- if (open(new->path, O_WRONLY | O_NDELAY) < 0)
+ if (open(newp->path, O_WRONLY | O_NDELAY) < 0)
{
- gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "open dummy %s", new->path);
+ gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "open dummy %s", newp->path);
exit(1);
}
- new->outbuffer = 0;
- new->outbuffer_size = 0;
- new->outbuffer_offset = 0;
- new->cache_level = -1;
- new->cache_fd = -1;
- return new;
+ newp->outbuffer = 0;
+ newp->outbuffer_size = 0;
+ newp->outbuffer_offset = 0;
+ newp->cache_level = -1;
+ newp->cache_fd = -1;
+ newp->save_level = 0;
+ return newp;
}
static void wproto_uncache(WCLIENT wc, int level)
@@ -548,6 +537,25 @@ static int wproto_findcache(WCLIENT wc, char *name)
return -1;
}
+int wproto_save_push (WCLIENT wc)
+{
+ return wc->outbuffer_offset;
+ wc->save_level++;
+}
+
+char *wproto_save_pop (WCLIENT wc, int offset)
+{
+ char *cp;
+ if (!wc->save_level)
+ return NULL;
+ --(wc->save_level);
+ assert (offset <= wc->outbuffer_offset);
+ cp = wc->outbuffer + offset;
+ wc->outbuffer[wc->outbuffer_offset] = '\0';
+ wc->outbuffer_offset = offset;
+ return cp;
+}
+
static int wproto_dumpcache(WCLIENT wc, int level)
{
int fd, rd;