Log angel changing action and report every week

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3532 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

2 files changed, 37 insertions, 1 deletions

diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index 6b715c8e..d8972482 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -3274,6 +3274,12 @@ t_changeangel(){
 	    "更換小天使後就無法換回了喔！ 是否要更換小天使？ [y/N]",
 	    buf, 3, LCECHO);
     if (buf[0] == 'y' || buf[0] == 'Y') {
+	char buf[100];
+	snprintf(buf, sizeof(buf), "%s小主人 %s 換掉 %s 小天使\n",
+		ctime(&now), cuser.userid, cuser.myangel);
+	buf[24] = ' '; // replace '\n'
+	log_file(BBSHOME "/log/changeangel.log", LOG_CREAT, buf);
+
 	cuser.myangel[0] = 0;
 	outs("小天使更新完成，下次呼叫時會選出新的小天使");
     }
diff --git a/util/angel.c b/util/angel.c
index e434a46b..c12cb555 100644
--- a/util/angel.c
+++ b/util/angel.c
@@ -26,6 +26,7 @@ int RejCmp(const void * a, const void * b){
 
 void readData();
 void sendResult();
+void slurp(FILE* to, FILE* from);
 
 int main(int argc, char* argv[]){
     if (argc > 1)
@@ -109,7 +110,7 @@ int mailalertuser(char* userid)
     if (userid[0] && (uentp = search_ulist_userid(userid)))
          uentp->alerts|=ALERT_NEW_MAIL;
     return 0;
-}      
+}
 
 void sendResult(){
     int i;
@@ -164,6 +165,17 @@ void sendResult(){
     }
     if (i % 4 != 0) fputc('\n', fp);
 
+    {
+	FILE* changefp = fopen(BBSHOME "/log/changeangel.log", "r");
+	if (changefp) {
+	    remove(BBSHOME "/log/changeangel.log");
+
+	    fputs("\n== 本周更換小天使紀錄 ==\n", fp);
+	    slurp(fp, changefp);
+	    fclose(changefp);
+	}
+    }
+
     fputs("\n--\n\n  本資料由 angel 程式產生\n\n", fp);
     fclose(fp);
 
@@ -174,4 +186,22 @@ void sendResult(){
     mailalertuser(mailto);
 }
 
+void slurp(FILE* to, FILE* from)
+{
+    char buf[4096]; // 4K block
+    int count;
+
+    while ((count = fread(buf, 1, sizeof(buf), from)) > 0) {
+	char * p = buf;
+	while (count > 0) {
+	    int i = fwrite(p, 1, count, to);
+
+	    if (i <= 0) return;
+
+	    p += i;
+	    count -= i;
+	}
+    }
+}
+
 #endif /* defined PLAY_ANGEL */