Move simple subtstitution functions to the message functions

diff --git a/citadel/citserver.c b/citadel/citserver.c
index d91b976b059bc003bc3a4bd2cc06dde4fc0602b0..a06940d68c6b55c1415c8d8e565f71763a7f79bf 100644 (file)
--- 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 94c7e8d90ab276fc527a37bbb25705bc23d6c89d..37028a7496e6b6dbd2cab569c78c9aceb4fc47d0 100644 (file)
--- 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 c7aab3468911b9e49c853e85a9008d21000dc243..f50547c2ee41814ce2341278e59c963c60ddeae5 100644 (file)
--- 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 81c5231e6db881e819f87db3e2d5c3836bf60841..405790cb43ded6e5b56871264ae5f2931eec99be 100644 (file)
--- 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 b1df41bfbd58612e7896514ac1fc191c200ae458..645e5f7442ee1db5aadecbfe81cf037be9441d37 100644 (file)
--- 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);