From 936306efc3fd3091717b41b2dd6ecda988e5d824 Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Fri, 4 May 2012 15:25:06 +0000
Subject: Use "board link" instead of "symbolic link".

git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5675 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 pttbbs/include/proto.h |  6 +++---
 pttbbs/mbbsd/admin.c   | 12 ++++++------
 pttbbs/mbbsd/board.c   |  7 +++----
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pttbbs/include/proto.h b/pttbbs/include/proto.h
index 74cda234..8c51d051 100644
--- a/pttbbs/include/proto.h
+++ b/pttbbs/include/proto.h
@@ -24,9 +24,9 @@ int m_register(void);
 int cat_register(void);
 unsigned int setperms(unsigned int pbits, const char * const pstring[]);
 void setup_man(const boardheader_t * board, const boardheader_t * oldboard);
-void delete_symbolic_link(boardheader_t *bh, int bid);
-int make_symbolic_link(const char *bname, int gid);
-int make_symbolic_link_interactively(int gid);
+void delete_board_link(boardheader_t *bh, int bid);
+int make_board_link(const char *bname, int gid);
+int make_board_link_interactively(int gid);
 void merge_dir(const char *dir1, const char *dir2, int isoutter);
 
 /* angel */
diff --git a/pttbbs/mbbsd/admin.c b/pttbbs/mbbsd/admin.c
index 587971fb..a49ab3ad 100644
--- a/pttbbs/mbbsd/admin.c
+++ b/pttbbs/mbbsd/admin.c
@@ -421,7 +421,7 @@ setup_man(const boardheader_t * board, const boardheader_t * oldboard)
 #endif
 }
 
-void delete_symbolic_link(boardheader_t *bh, int bid)
+void delete_board_link(boardheader_t *bh, int bid)
 {
     assert(0<=bid-1 && bid-1<MAX_BOARD);
     memset(bh, 0, sizeof(boardheader_t));
@@ -586,7 +586,7 @@ m_mod_board(char *bname)
 	if (genbuf[0] != 'y' || !bname[0])
 	    outs(MSG_DEL_CANCEL);
 	else if (bh.brdattr & BRD_SYMBOLIC) {
-	    delete_symbolic_link(&bh, bid);
+	    delete_board_link(&bh, bid);
 	}
 	else {
 	    strlcpy(bname, bh.brdname, sizeof(bh.brdname));
@@ -936,7 +936,7 @@ m_newbrd(int whatclass, int recover)
     return 0;
 }
 
-int make_symbolic_link(const char *bname, int gid)
+int make_board_link(const char *bname, int gid)
 {
     boardheader_t   newboard;
     int bid;
@@ -955,7 +955,7 @@ int make_symbolic_link(const char *bname, int gid)
      *
      *   Duplicate entry with same brdname may cause wrong result, if
      *   searching by key brdname.  But people don't need to know a board
-     *   is symbolic, so just let SYSOP know it. You may want to read
+     *   is a link, so just let SYSOP know it. You may want to read
      *   board.c:load_boards().
      */
 
@@ -973,7 +973,7 @@ int make_symbolic_link(const char *bname, int gid)
     return bid;
 }
 
-int make_symbolic_link_interactively(int gid)
+int make_board_link_interactively(int gid)
 {
     char buf[32];
 
@@ -983,7 +983,7 @@ int make_symbolic_link_interactively(int gid)
 
     vs_hdr("建立看板連結");
 
-    if (make_symbolic_link(buf, gid) < 0) {
+    if (make_board_link(buf, gid) < 0) {
 	vmsg("看板連結建立失敗");
 	return -1;
     }
diff --git a/pttbbs/mbbsd/board.c b/pttbbs/mbbsd/board.c
index b9c69417..febfec71 100644
--- a/pttbbs/mbbsd/board.c
+++ b/pttbbs/mbbsd/board.c
@@ -1101,7 +1101,7 @@ load_boards(char *key)
 		continue;
 
 	    if (bptr->brdattr & BRD_SYMBOLIC) {
-		/* Only SYSOP knows a board is symbolic */
+		/* Only SYSOP knows a board is a link or not. */
 		if (HasUserPerm(PERM_SYSOP) || HasUserPerm(PERM_SYSSUPERSUBOP))
 		    state |= NBRD_SYMBOLIC;
 		else {
@@ -1925,8 +1925,7 @@ choose_board(int newflag)
 	case 'L':
 	    if ((HasUserPerm(PERM_SYSOP) ||
 			(HasUserPerm(PERM_SYSSUPERSUBOP) && GROUPOP())) && IN_CLASS()) {
-		// TODO XXX why need symlink here? Can we remove it?
-		if (make_symbolic_link_interactively(class_bid) < 0)
+		if (make_board_link_interactively(class_bid) < 0)
 		    break;
 		brdnum = -1;
 		head = 9999;
@@ -2133,7 +2132,7 @@ choose_board(int newflag)
 		ptr = &nbrd[num];
 		if (ptr->myattr & NBRD_SYMBOLIC) {
 		    if (vans("確定刪除連結？[N/y]") == 'y')
-			delete_symbolic_link(getbcache(ptr->bid), ptr->bid);
+			delete_board_link(getbcache(ptr->bid), ptr->bid);
 		}
 		brdnum = -1;
 	    }
-- 
cgit v1.2.3