* All OS-level includes are now included from webcit.h instead of from

[citadel.git] / webcit / subst.c

diff --git a/webcit/subst.c b/webcit/subst.c
index 9b107de352bddd72293fb5069515e2eda57095bc..562ae254e1badbeb533be6742e7ee4d0ada0f7e2 100644 (file)
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -7,30 +7,8 @@
 
 
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
-struct wcsubst *global_subst = NULL;
-
 
 /*
  * Clear out the list of substitution variables local to this session
@@ -49,6 +27,8 @@ void clear_local_substs(void) {
                free(WC->vars);
                WC->vars = ptr;
        }
+
+       WC->vars = NULL;
 }
 
 
@@ -58,20 +38,36 @@ void clear_local_substs(void) {
 void svprintf(char *keyname, int keytype, const char *format,...)
 {
        va_list arg_ptr;
-       char wbuf[1024];
-       struct wcsubst *ptr;
+       char wbuf[SIZ];
+       struct wcsubst *ptr = NULL;
+       struct wcsubst *scan;
+
+       /* First scan through to see if we're doing a replacement of
+        * an existing key
+        */
+       for (scan=WC->vars; scan!=NULL; scan=scan->next) {
+               if (!strcasecmp(scan->wcs_key, keyname)) {
+                       ptr = scan;
+                       free(ptr->wcs_value);
+               }
+       }
+
+       /* Otherwise allocate a new one */
+       if (ptr == NULL) {
+               ptr = (struct wcsubst *) malloc(sizeof(struct wcsubst));
+               ptr->next = WC->vars;
+               safestrncpy(ptr->wcs_key, keyname, sizeof ptr->wcs_key);
+               WC->vars = ptr;
+       }
+
+       /* Format the string and save it */
 
        va_start(arg_ptr, format);
-       vsprintf(wbuf, format, arg_ptr);
+       vsnprintf(wbuf, sizeof wbuf, format, arg_ptr);
        va_end(arg_ptr);
 
-       ptr = (struct wcsubst *) malloc(sizeof(struct wcsubst));
-       ptr->next = WC->vars;
        ptr->wcs_type = keytype;
-       strcpy(ptr->wcs_key, keyname);
-       ptr->wcs_value = malloc(strlen(wbuf)+1);
-       strcpy(ptr->wcs_value, wbuf);
-       WC->vars = ptr;
+       ptr->wcs_value = strdup(wbuf);
 }
 
 /*
@@ -98,7 +94,7 @@ void pvo_do_cmd(char *servcmd) {
        char buf[SIZ];
 
        serv_puts(servcmd);
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
 
        switch(buf[0]) {
                case '2':
@@ -107,7 +103,7 @@ void pvo_do_cmd(char *servcmd) {
                        wprintf("%s\n", &buf[4]);
                        break;
                case '1':
-                       fmout(NULL);
+                       fmout(NULL, "CENTER");
                        break;
                case '4':
                        wprintf("%s\n", &buf[4]);
@@ -125,24 +121,28 @@ void print_value_of(char *keyname) {
        struct wcsubst *ptr;
        void *fcn();
 
+       if (keyname[0] == '=') {
+               do_template(&keyname[1]);
+       }
+
        if (!strcasecmp(keyname, "SERV_PID")) {
-               wprintf("%d", serv_info.serv_pid);
+               wprintf("%d", WC->ctdl_pid);
        }
 
        else if (!strcasecmp(keyname, "SERV_NODENAME")) {
-               wprintf("%s", serv_info.serv_nodename);
+               escputs(serv_info.serv_nodename);
        }
 
        else if (!strcasecmp(keyname, "SERV_HUMANNODE")) {
-               wprintf("%s", serv_info.serv_humannode);
+               escputs(serv_info.serv_humannode);
        }
 
        else if (!strcasecmp(keyname, "SERV_FQDN")) {
-               wprintf("%s", serv_info.serv_fqdn);
+               escputs(serv_info.serv_fqdn);
        }
 
        else if (!strcasecmp(keyname, "SERV_SOFTWARE")) {
-               wprintf("%s", serv_info.serv_software);
+               escputs(serv_info.serv_software);
        }
 
        else if (!strcasecmp(keyname, "SERV_REV_LEVEL")) {
@@ -153,7 +153,15 @@ void print_value_of(char *keyname) {
        }
 
        else if (!strcasecmp(keyname, "SERV_BBS_CITY")) {
-               wprintf("%s", serv_info.serv_bbs_city);
+               escputs(serv_info.serv_bbs_city);
+       }
+
+       else if (!strcasecmp(keyname, "CURRENT_USER")) {
+               escputs(WC->wc_username);
+       }
+
+       else if (!strcasecmp(keyname, "CURRENT_ROOM")) {
+               escputs(WC->wc_roomname);
        }
 
        /* Page-local variables */
@@ -195,7 +203,7 @@ void do_template(void *templatename) {
        fp = fopen(filename, "r");
        if (fp == NULL) {
                wprintf("<BLINK>ERROR</BLINK> - could not open template ");
-               wprintf("'%s' - %s<BR>\n",
+               wprintf("'%s' - %s<br />\n",
                        templatename, strerror(errno));
                return;
        }