#include <signal.h>
#include "webcit.h"
-struct wcsubst *global_subst = NULL;
-
/*
* Clear out the list of substitution variables local to this session
free(WC->vars);
WC->vars = ptr;
}
+
+ WC->vars = NULL;
}
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);
}
/*
* back end for print_value_of() ... does a server command
*/
void pvo_do_cmd(char *servcmd) {
- char buf[256];
+ char buf[SIZ];
serv_puts(servcmd);
serv_gets(buf);
wprintf("%s\n", &buf[4]);
break;
case '1':
- fmout(NULL);
+ fmout(NULL, "CENTER");
break;
case '4':
wprintf("%s\n", &buf[4]);
struct wcsubst *ptr;
void *fcn();
- for (ptr = WC->vars; ptr != NULL; ptr = ptr->next) {
+ if (keyname[0] == '=') {
+ do_template(&keyname[1]);
+ }
+
+ if (!strcasecmp(keyname, "SERV_PID")) {
+ wprintf("%d", WC->ctdl_pid);
+ }
+
+ else if (!strcasecmp(keyname, "SERV_NODENAME")) {
+ escputs(serv_info.serv_nodename);
+ }
+
+ else if (!strcasecmp(keyname, "SERV_HUMANNODE")) {
+ escputs(serv_info.serv_humannode);
+ }
+
+ else if (!strcasecmp(keyname, "SERV_FQDN")) {
+ escputs(serv_info.serv_fqdn);
+ }
+
+ else if (!strcasecmp(keyname, "SERV_SOFTWARE")) {
+ escputs(serv_info.serv_software);
+ }
+
+ else if (!strcasecmp(keyname, "SERV_REV_LEVEL")) {
+ wprintf("%d.%02d",
+ serv_info.serv_rev_level / 100,
+ serv_info.serv_rev_level % 100
+ );
+ }
+
+ else if (!strcasecmp(keyname, "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 */
+ else for (ptr = WC->vars; ptr != NULL; ptr = ptr->next) {
if (!strcasecmp(ptr->wcs_key, keyname)) {
if (ptr->wcs_type == WCS_STRING) {
wprintf("%s", ptr->wcs_value);
strcpy(filename, "static/");
strcat(filename, templatename);
+ if (WC->is_wap)
+ strcat(filename, ".wml");
+ else
+ strcat(filename, ".html");
fp = fopen(filename, "r");
if (fp == NULL) {