From c17b1ec0c4c66cbe2761fa0e8c83831e6258d11d Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Thu, 27 Mar 2008 06:26:11 +0000
Subject: - (internal) move UTIL_C API from mbbsd/stuff to cmbbs.

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4031 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 include/cmbbs.h     | 27 +++++++++++++++++++++++++++
 include/osdep.h     |  7 +++++++
 include/proto.h     | 21 +--------------------
 include/pttstruct.h |  2 ++
 4 files changed, 37 insertions(+), 20 deletions(-)

(limited to 'include')

diff --git a/include/cmbbs.h b/include/cmbbs.h
index de042a03..b6c69adb 100644
--- a/include/cmbbs.h
+++ b/include/cmbbs.h
@@ -1,6 +1,33 @@
 #ifndef _LIBBBS_H_
 #define _LIBBBS_H_
 
+#include "config.h"
+#include "common.h"
+#include "cmsys.h"
+#include "pttstruct.h"
+
+/* name.c */
+extern int is_validuserid(const char *id);
+
+/* path.c */
+/* XXX set*() all assume buffer size = PATHLEN */
+extern void setdirpath(char *buf, const char *direct, const char *fname);
+extern void setbpath (char *buf, const char *boardname);
+extern void setbfile (char *buf, const char *boardname, const char *fname);
+extern void setbnfile(char *buf, const char *boardname, const char *fname, int n);
+extern void setapath(char *buf, const char *boardname);
+extern void setadir (char *buf, const char *path);
+extern void sethomepath(char *buf, const char *userid);
+extern void sethomedir (char *buf, const char *userid);
+extern void sethomeman (char *buf, const char *userid);
+extern void sethomefile(char *buf, const char *userid, const char *fname);
+// setbdir
+// setuserfile
+
+/* file.c */
+extern int belong(const char *filelist, const char *key);
+
+/* money.c */
 extern int give_tax(int money);
 extern const char* money_level(int money);
 
diff --git a/include/osdep.h b/include/osdep.h
index 351d55af..89cb1edb 100644
--- a/include/osdep.h
+++ b/include/osdep.h
@@ -61,5 +61,12 @@
     #define Signal (signal)
 #endif
 
+#ifdef NEED_STRLCPY
+    size_t strlcpy(char *dst, const char *src, size_t size);
+#endif
+#ifdef NEED_STRLCAT
+    size_t strlcat(char *dst, const char *src, size_t size);
+#endif
+
 
 #endif
diff --git a/include/proto.h b/include/proto.h
index c51afb43..2fabbfba 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -124,10 +124,8 @@ void touchbpostnum(int bid, int delta);
 void reset_board(int bid);
 void touch_boards(void);
 void addbrd_touchcache(void);
-void setapath(char *buf, const char *boardname);
 void setutmpmode(unsigned int mode);
 unsigned int  getutmpmode(void);
-void setadir(char *buf, const char *path);
 int apply_boards(int (*func)(boardheader_t *));
 int haspostperm(const char *bname);
 const char * postperm_msg(const char *bname);
@@ -467,13 +465,6 @@ int cpuload(char *str);
 void initsetproctitle(int argc, char **argv, char **envp);
 void setproctitle(const char* format, ...) GCC_CHECK_FORMAT(1,2);
 
-#ifdef NEED_STRLCPY
-    size_t strlcpy(char *dst, const char *src, size_t size);
-#endif
-
-#ifdef NEED_STRLCAT
-    size_t strlcat(char *dst, const char *src, size_t size);
-#endif
 
 /* othello */
 int othello_main(void);
@@ -598,26 +589,16 @@ int vmsgf(const char *fmt,...) GCC_CHECK_FORMAT(1,2);
 int vmsg(const char *msg);
 int show_file(const char *filename, int y, int lines, int mode);
 void bell(void);
-void setbpath(char *buf, const char *boardname);
-void sethomepath(char *buf, const char *userid);
-void sethomedir(char *buf, const char *userid);
-void sethomefile(char *buf, const char *userid, const char *fname);
 int cursor_key(int row, int column);
 int search_num(int ch, int max);
-void setuserfile(char *buf, const char *fname);
 int is_BM(const char *list);
+void setuserfile(char *buf, const char *fname);
 void setbdir(char *buf, const char *boardname);
-void setbfile(char *buf, const char *boardname, const char *fname);
-void setbnfile(char *buf, const char *boardname, const char *fname, int n);
 void setaidfile(char *buf, const char *bn, aidu_t aidu);
 char *subject(char *title);
-int is_validuserid(const char *id);
-void setdirpath(char *buf, const char *direct, const char *fname);
 int str_checksum(const char *str);
 void show_help(const char * const helptext[]);
 void show_helpfile(const char * helpfile);
-int belong(const char *filelist, const char *key);
-void sethomeman(char *buf, const char *userid);
 void cursor_clear(int row, int column);
 void cursor_show(int row, int column);
 void printdash(const char *mesg, int msglen);
diff --git a/include/pttstruct.h b/include/pttstruct.h
index 2dac5e79..4e8f6983 100644
--- a/include/pttstruct.h
+++ b/include/pttstruct.h
@@ -2,6 +2,8 @@
 #ifndef INCLUDE_STRUCT_H
 #define INCLUDE_STRUCT_H
 
+#include "statistic.h" // for MAX_STATS
+
 #define IDLEN      12             /* Length of bid/uid */
 
 /* Äv¼Ð¸ê°T */
-- 
cgit v1.2.3