From 3f38764fec43f8d18e3b0f2cb8d4de6aecc8618b Mon Sep 17 00:00:00 2001
From: jack <jack@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Thu, 22 Apr 2004 22:02:28 +0000
Subject: Modified the function of festival

git-svn-id: http://opensvn.csie.org/pttbbs/branches/Jaky.i18n@1815 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 pttbbs.mk      |  2 +-
 util/account.c | 33 ++++++++++++++++++++++++++-------
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/pttbbs.mk b/pttbbs.mk
index 9df09196..18914593 100644
--- a/pttbbs.mk
+++ b/pttbbs.mk
@@ -4,7 +4,7 @@ BBSHOME?=	$(HOME)
 BBSHOME?=	/home/bbs
 OSTYPE!=	uname
 CC?=		gcc
-CCACHE!=	which ccache|sed -e 's/^.*\///'
+#CCACHE!=	which ccache|sed -e 's/^.*\///'
 PTT_CFLAGS=	-Wall -pipe -DBBSHOME='"$(BBSHOME)"' -I../include
 PTT_LDFLAGS=	-pipe -Wall -L/usr/local/lib
 PTT_LIBS=	-lcrypt -lhz
diff --git a/util/account.c b/util/account.c
index 77f21e5d..6c05b569 100644
--- a/util/account.c
+++ b/util/account.c
@@ -91,9 +91,10 @@ void gzip(source, target, stamp)
 int main(int argc, char **argv)
 {
     int hour, max, item, total, i, j, mo, da, max_user = 0, max_login = 0,
-	max_reg = 0, mahour = 0, k;
+	max_reg = 0, mahour = 0, k, wday;
     char *act_file = ".act";
     char *log_file = "usies";
+    char *wday_str = "UMTWRFS";
     char buf[256], buf1[256], *p;
     FILE *fp, *fp1;
     int act[27];		/* 次數/累計時間/pointer */
@@ -329,11 +330,29 @@ int main(int argc, char **argv)
 	    if((fp = fopen("etc/feast", "r"))) {
 		while(fgets(buf1, sizeof(buf1), fp)) {
 		    if(buf[0] != '#' &&
-		       sscanf(buf1, "%d %d ", &mo, &da) == 2) {
-			if(ptime->tm_mday == da && ptime->tm_mon + 1 == mo) {
-			    i = 1;
-			    fprintf(fp1, "%-14.14s", &buf1[6]);
-			}
+		       sscanf(buf1, "%d %c%c", &mo, buf, buf+1) == 3) {
+		          if (isdigit(buf[0])) {
+		             if (isdigit(buf[1])) {
+		             	da = 10 * (buf[0] - '0') + (buf[1] - '0');
+         			if(ptime->tm_mday == da && ptime->tm_mon + 1 == mo) {
+	         		   i = 1;
+		        	   fprintf(fp1, "%-14.14s", &buf1[6]);
+			        }		             	
+		             }
+		             else {
+		                if (buf[0] - '0' <= 4) {
+		                   wday = 0;
+		                   buf[1] = toupper(buf[1]);
+		                   while(wday < 7 && buf[1] != *(wday_str + wday))
+		                      wday++;
+		                   if (ptime->tm_mon + 1 == mo && ptime->tm_wday == wday && 
+		                   	(ptime->tm_mday - 1)/7 + 1 == (buf[0] - '0')) {
+		                   	i = 1;
+		                   	fprintf(fp1, "%-14.14s", &buf1[6]);
+		                   }
+		                }
+		             }
+		          }
 		    }
 		}
 		fclose(fp);
@@ -342,7 +361,7 @@ int main(int argc, char **argv)
 	    if(i == 0) {
 		if((fp = fopen("etc/today_boring", "r"))) {
 		    while(fgets(buf1, sizeof(buf1), fp))
-			if(strlen(buf) > 3)
+			if(strlen(buf1) > 3)
 			    fprintf(fp1, "%s", buf1);
 		    fclose(fp);
 		} else
-- 
cgit v1.2.3