* *** HUGE CHANGES *** *** WARNING: NOT FULLY FUNCTIONAL ***

[citadel.git] / webcit / subst.c

diff --git a/webcit/subst.c b/webcit/subst.c
index 87441c5e240d01434fda35c5854dc6f19df5d6c3..9392cffee978d20d60eb41b2f6e926e00808fafb 100644 (file)
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -29,8 +29,6 @@
 #include <signal.h>
 #include "webcit.h"
 
-struct wcsubst *global_subst = NULL;
-
 
 /*
  * Clear out the list of substitution variables local to this session
@@ -49,6 +47,8 @@ void clear_local_substs(void) {
                free(WC->vars);
                WC->vars = ptr;
        }
+
+       WC->vars = NULL;
 }
 
 
@@ -58,14 +58,10 @@ void clear_local_substs(void) {
 void svprintf(char *keyname, int keytype, const char *format,...)
 {
        va_list arg_ptr;
-       char wbuf[1024];
+       char wbuf[SIZ];
        struct wcsubst *ptr = NULL;
        struct wcsubst *scan;
 
-       va_start(arg_ptr, format);
-       vsprintf(wbuf, format, arg_ptr);
-       va_end(arg_ptr);
-
        /* First scan through to see if we're doing a replacement of
         * an existing key
         */
@@ -80,13 +76,18 @@ void svprintf(char *keyname, int keytype, const char *format,...)
        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);
+       vsnprintf(wbuf, sizeof wbuf, format, arg_ptr);
+       va_end(arg_ptr);
+
        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);
 }
 
 /*
@@ -145,23 +146,23 @@ void print_value_of(char *keyname) {
        }
 
        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")) {
@@ -172,7 +173,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 */
@@ -214,7 +223,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;
        }