From 6deb8c095903d745226ea2a6935d41f8cd0bb499 Mon Sep 17 00:00:00 2001 From: ptt Date: Fri, 29 Mar 2002 13:45:28 +0000 Subject: *** empty log message *** git-svn-id: http://opensvn.csie.org/pttbbs/pttbbs/trunk/pttbbs@70 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- mbbsd/Makefile | 4 ++-- mbbsd/mbbsd.c | 20 +------------------- mbbsd/vote.c | 14 +++++++------- 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/mbbsd/Makefile b/mbbsd/Makefile index 6281e2fe..5919b885 100644 --- a/mbbsd/Makefile +++ b/mbbsd/Makefile @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.3 2002/03/16 13:19:46 ptt Exp $ +# $Id: Makefile,v 1.4 2002/03/29 13:45:28 ptt Exp $ BBSHOME?=$(HOME) -OSTYPE=linux +OSTYPE=FreeBSD # FreeBSD CFLAGS_FreeBSD= -pipe -Wall -g -O3 -DHAVE_SETPROCTITLE -DBBSHOME='"$(BBSHOME)"' -DFreeBSD -I../include diff --git a/mbbsd/mbbsd.c b/mbbsd/mbbsd.c index 2e910180..c793b6bc 100644 --- a/mbbsd/mbbsd.c +++ b/mbbsd/mbbsd.c @@ -1,4 +1,4 @@ -/* $Id: mbbsd.c,v 1.15 2002/03/23 09:04:54 in2 Exp $ */ +/* $Id: mbbsd.c,v 1.16 2002/03/29 13:45:28 ptt Exp $ */ #include #include #include @@ -1002,9 +1002,6 @@ static void start_client () { extern struct commands_t cmdlist[]; -#if FORCE_PROCESS_REGISTER_FORM - int nreg; -#endif #ifdef CPULIMIT struct rlimit rml; rml.rlim_cur = CPULIMIT * 60; @@ -1041,26 +1038,11 @@ start_client () user_login (); m_init (); -#if FORCE_PROCESS_REGISTER_FORM - if (HAS_PERM (PERM_SYSOP) && (nreg = dashs (fn_register) / 163) > 100){ - char cpu_load[30]; - if (cpuload (cpu_load) > MAX_CPULOAD * 2 / 3) - /* DickG: 根據目前的 load 來決定要審核的數目 */ - scan_register_form (fn_register, 1, nreg / 20); - else - scan_register_form (fn_register, 1, nreg / 10); - } -#endif if (HAVE_PERM (PERM_SYSOP | PERM_BM)) b_closepolls (); if (!(cuser.uflag & COLOR_FLAG)) showansi = 0; -#ifdef DOTIMEOUT - /* init_alarm(); */// cause strange logout with saving post. signal (SIGALRM, SIG_IGN); -#else - signal (SIGALRM, SIG_IGN); -#endif if (chkmailbox ()) m_read (); diff --git a/mbbsd/vote.c b/mbbsd/vote.c index b16857ce..8835a483 100644 --- a/mbbsd/vote.c +++ b/mbbsd/vote.c @@ -1,4 +1,4 @@ -/* $Id: vote.c,v 1.2 2002/03/09 17:27:57 in2 Exp $ */ +/* $Id: vote.c,v 1.3 2002/03/29 13:45:28 ptt Exp $ */ #include #include #include @@ -304,7 +304,7 @@ static void b_result(boardheader_t *fh) { char temp[STRLEN]; now = time(NULL); - for(i = 0; i < 9; i++) { + for(i = 0; i < 20; i++) { if(i) sprintf(STR_new_control, "%s%d", STR_bv_control, i); else @@ -511,7 +511,7 @@ static int vote_view_all(char *bname) { fclose(xfp); } - for(i = 1; i < 9; i++) { + for(i = 1; i < 20; i++) { sprintf(STR_new_control, "%s%d", STR_bv_control, i); sprintf(STR_new_title, "%s%d", STR_bv_title, i); setbfile(buf, bname, STR_new_control); @@ -593,7 +593,7 @@ static int vote_maintain(char *bname) { setbfile(buf, bname, STR_bv_title); unlink(buf); - for(i = 1; i < 9; i++) { + for(i = 1; i < 20; i++) { sprintf(STR_new_ballots, "%s%d", STR_bv_ballots, i); sprintf(STR_new_control, "%s%d", STR_bv_control, i); sprintf(STR_new_desc, "%s%d", STR_bv_desc, i); @@ -626,7 +626,7 @@ static int vote_maintain(char *bname) { strcpy(STR_new_control, STR_bv_control); setbfile(buf,bname, STR_new_control); x = 0; - while(x < 9 && (fp = fopen(buf,"r")) != NULL) { + while(x < 20 && (fp = fopen(buf,"r")) != NULL) { fclose(fp); x++; sprintf(STR_new_control, "%s%d", STR_bv_control, x); @@ -634,7 +634,7 @@ static int vote_maintain(char *bname) { } if(fp) fclose(fp); - if(x >=9) + if(x >=20) return FULLUPDATE; if(x) { sprintf(STR_new_ballots, "%s%d", STR_bv_ballots,x); @@ -1002,7 +1002,7 @@ static int user_vote(char *bname) { fclose(xfp); } - for(i = 1; i < 9; i++) { + for(i = 1; i < 20; i++) { sprintf(STR_new_control, "%s%d", STR_bv_control, i); sprintf(STR_new_title, "%s%d", STR_bv_title, i); setbfile(buf, bname, STR_new_control); -- cgit v1.2.3