From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 1 Sep 2013 13:11:29 +0000 (+0200)
Subject: Move simple subtstitution functions to the message functions
X-Git-Tag: v9.01~273
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=d2ad0f3fb9966e14acc36f9e89f48f581fb4add7

Move simple subtstitution functions to the message functions
---

diff --git a/citadel/citserver.c b/citadel/citserver.c
index d91b976b0..a06940d68 100644
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -492,6 +492,40 @@ void cmd_iden(char *argbuf)
 	cprintf("%d Ok\n",CIT_OK);
 }
 
+
+/* 
+ * help_subst()  -  support routine for help file viewer
+ */
+void help_subst(char *strbuf, char *source, char *dest)
+{
+	char workbuf[SIZ];
+	int p;
+
+	while (p = pattern2(strbuf, source), (p >= 0)) {
+		strcpy(workbuf, &strbuf[p + strlen(source)]);
+		strcpy(&strbuf[p], dest);
+		strcat(strbuf, workbuf);
+	}
+}
+
+void do_help_subst(char *buffer)
+{
+	char buf2[16];
+
+	help_subst(buffer, "^nodename", config.c_nodename);
+	help_subst(buffer, "^humannode", config.c_humannode);
+	help_subst(buffer, "^fqdn", config.c_fqdn);
+	help_subst(buffer, "^username", CC->user.fullname);
+	snprintf(buf2, sizeof buf2, "%ld", CC->user.usernum);
+	help_subst(buffer, "^usernum", buf2);
+	help_subst(buffer, "^sysadm", config.c_sysadm);
+	help_subst(buffer, "^variantname", CITADEL);
+	snprintf(buf2, sizeof buf2, "%d", config.c_maxsessions);
+	help_subst(buffer, "^maxsessions", buf2);
+	help_subst(buffer, "^bbsdir", ctdl_message_dir);
+}
+
+
 typedef const char *ccharp;
 /*
  * display system messages or help
diff --git a/citadel/citserver.h b/citadel/citserver.h
index 94c7e8d90..37028a749 100644
--- a/citadel/citserver.h
+++ b/citadel/citserver.h
@@ -48,6 +48,9 @@ void citproto_begin_admin_session(void);
 void GenerateRoomDisplay(char *real_room,
                         CitContext *viewed,
                         CitContext *viewer);
+
+void help_subst (char *strbuf, char *source, char *dest);
+
 extern int panic_fd;
 char CtdlCheckExpress(void);
 extern time_t server_startup_time;
diff --git a/citadel/modules/extnotify/funambol65.c b/citadel/modules/extnotify/funambol65.c
index c7aab3468..f50547c2e 100644
--- a/citadel/modules/extnotify/funambol65.c
+++ b/citadel/modules/extnotify/funambol65.c
@@ -36,6 +36,7 @@
 #include <curl/curl.h>
 
 #include "citadel.h"
+#include "citserver.h"
 #include "citadel_dirs.h"
 #include "clientsocket.h"
 #include "sysdep.h"
diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 81c5231e6..405790cb4 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1157,43 +1157,6 @@ void cmd_msgs(char *cmdbuf)
 }
 
 
-
-
-/* 
- * help_subst()  -  support routine for help file viewer
- */
-void help_subst(char *strbuf, char *source, char *dest)
-{
-	char workbuf[SIZ];
-	int p;
-
-	while (p = pattern2(strbuf, source), (p >= 0)) {
-		strcpy(workbuf, &strbuf[p + strlen(source)]);
-		strcpy(&strbuf[p], dest);
-		strcat(strbuf, workbuf);
-	}
-}
-
-
-void do_help_subst(char *buffer)
-{
-	char buf2[16];
-
-	help_subst(buffer, "^nodename", config.c_nodename);
-	help_subst(buffer, "^humannode", config.c_humannode);
-	help_subst(buffer, "^fqdn", config.c_fqdn);
-	help_subst(buffer, "^username", CC->user.fullname);
-	snprintf(buf2, sizeof buf2, "%ld", CC->user.usernum);
-	help_subst(buffer, "^usernum", buf2);
-	help_subst(buffer, "^sysadm", config.c_sysadm);
-	help_subst(buffer, "^variantname", CITADEL);
-	snprintf(buf2, sizeof buf2, "%d", config.c_maxsessions);
-	help_subst(buffer, "^maxsessions", buf2);
-	help_subst(buffer, "^bbsdir", ctdl_message_dir);
-}
-
-
-
 /*
  * memfmout()  -  Citadel text formatter and paginator.
  *	     Although the original purpose of this routine was to format
diff --git a/citadel/msgbase.h b/citadel/msgbase.h
index b1df41bfb..645e5f744 100644
--- a/citadel/msgbase.h
+++ b/citadel/msgbase.h
@@ -97,8 +97,7 @@ extern struct addresses_to_be_filed *atbf;
 int alias (char *name);
 void cmd_msgs (char *cmdbuf);
 void cmd_isme (char *cmdbuf);
-void help_subst (char *strbuf, char *source, char *dest);
-void do_help_subst (char *buffer);
+
 void memfmout (char *mptr, const char *nl);
 void output_mime_parts(char *);
 void cmd_msg0 (char *cmdbuf);