workaround account bug

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

1 files changed, 8 insertions, 8 deletions

diff --git a/pttbbs/util/account.c b/pttbbs/util/account.c
index 201709d0..a0a0bc2a 100644
--- a/pttbbs/util/account.c
+++ b/pttbbs/util/account.c
@@ -323,25 +323,25 @@ out:
 static int
 update_holiday(struct tm *ptime)
 {
-    int i = 0, cnt = 0;
-    char buf[128], *p;
+    int i = 0;
+    char buf[128];
     FILE *fp;
 
     if ((fp = fopen("etc/today_is", "r")) == NULL)
 	return 1;
 
+    // I'm not sure what this is supposed to (check w/wens),
+    // but since this is buggy now, let's make it as "rotate through".
+    buf[0] = 0;
     for (i = 0; i <= ptime->tm_hour; i++) {
 	if (!fgets(buf, sizeof(buf), fp)) {
-	    cnt = i;
-	    i = i - 1 + (ptime->tm_hour - i) / cnt * cnt;
-	    rewind(fp);
+            rewind(fp);
+            fgets(buf, sizeof(buf), fp);
 	}
     }
 
     fclose(fp);
-
-    if ((p = strchr(buf, '\n')))
-	*p = 0;
+    chomp(buf);
 
     memset(SHM->today_is, 0, sizeof(SHM->today_is));
     strlcpy(SHM->today_is, buf, sizeof(SHM->today_is));