From bede7393f59b9d71afeef9f139e3e8877f54d10f Mon Sep 17 00:00:00 2001 From: piaip Date: Sat, 15 Dec 2007 18:59:12 +0000 Subject: - general message fix - screen: force dirty of ANSI escapes - bbs: isolate the process of making 'modification' to .DIR with recommends and edit_post. git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3685 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- mbbsd/bbs.c | 121 +++++++++++++++++++++++++++++++-------------------------- mbbsd/board.c | 1 + mbbsd/screen.c | 4 +- mbbsd/vote.c | 2 +- 4 files changed, 71 insertions(+), 57 deletions(-) (limited to 'mbbsd') diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c index 6763dcda..4e171012 100644 --- a/mbbsd/bbs.c +++ b/mbbsd/bbs.c @@ -67,6 +67,61 @@ query_file_money(const fileheader_t *pfh) return pfh->multi.money; } +// lite weight version to update dir files +static int +modify_dir_lite( + const char *direct, int ent, const char *fhdr_name, + time4_t modified, const char *title, char recommend) +{ + // since we want to do 'modification'... + int fd; + off_t sz = dashs(direct); + fileheader_t fhdr; + + // TODO lock? + // PttLock(fd, offset, size, F_WRLCK); + // write(fd, rptr, size); + // PttLock(fd, offset, size, F_UNLCK); + + // prevent black holes + if (sz < sizeof(fileheader_t) * (ent) || + (fd = open(direct, O_RDWR)) < 0 ) + return -1; + + // also check if fhdr->filename is same. + // let sz = base offset + sz = (sizeof(fileheader_t) * (ent-1)); + if (lseek(fd, sz, SEEK_SET) < 0 || + read(fd, &fhdr, sizeof(fhdr)) != sizeof(fhdr) || + strcmp(fhdr.filename, fhdr_name) != 0) + { + close(fd); + return -1; + } + + // update records + if (modified > 0) + fhdr.modified = modified; + + if (title && *title) + strcpy(fhdr.title, title); + + if (recommend) + { + recommend += fhdr.recommend; + if (recommend > 100) recommend = 100; + else if (recommend < -100) recommend = -100; + fhdr.recommend = recommend; + } + + if (lseek(fd, sz, SEEK_SET) >= 0) + write(fd, &fhdr, sizeof(fhdr)); + + close(fd); + + return 0; +} + /* hack for listing modes */ enum LISTMODES { LISTMODE_DATE = 0, @@ -1355,7 +1410,7 @@ edit_post(int ent, fileheader_t * fhdr, const char *direct) char genbuf[200]; fileheader_t postfile; boardheader_t *bp = getbcache(currbid); - int recordTouched = 0; + // int recordTouched = 0; time4_t oldmt, newmt; off_t oldsz; @@ -1546,29 +1601,17 @@ edit_post(int ent, fileheader_t * fhdr, const char *direct) // force to remove file first? // unlink(genbuf); Rename(fpath, genbuf); + fhdr->modified = dasht(genbuf); - // this is almost always true... - // whatever. + if (fhdr->modified > 0) { - time4_t oldm = fhdr->modified; - fhdr->modified = dasht(genbuf); - recordTouched = (oldm != fhdr->modified) ? 1 : 0; - } - - if(strcmp(save_title, fhdr->title)){ - // Ptt: here is the black hole problem - // (try getindex) - strcpy(fhdr->title, save_title); - recordTouched = 1; - } + // substitute_ref_record(direct, fhdr, ent); + modify_dir_lite(direct, ent, fhdr->filename, + fhdr->modified, save_title, 0); - if(recordTouched) - { - substitute_ref_record(direct, fhdr, ent); // mark my self as "read this file". brc_addlist(fhdr->filename, fhdr->modified); } - break; } while (1); @@ -2327,48 +2370,16 @@ do_add_recommend(const char *direct, fileheader_t *fhdr, // since we want to do 'modification'... fhdr->modified = dasht(path); - - if( /* update */ 1){ - int fd; - off_t sz = dashs(direct); - - // TODO we can also check if fhdr->filename is same. - // prevent black holes - if (sz < sizeof(fileheader_t) * (ent)) - { - return -1; - } - - //Ptt: update only necessary - if( (fd = open(direct, O_RDWR)) < 0 ) - return -1; - - // let sz = base offset - sz = (sizeof(fileheader_t) * (ent-1)); - if (lseek(fd, (sz + (char*)&fhdr->modified - (char*)fhdr), - SEEK_SET) < 0) - { - close(fd); + if (fhdr->modified > 0) + { + if (modify_dir_lite(direct, ent, fhdr->filename, + fhdr->modified, NULL, update) < 0) return -1; - } - - write(fd, &fhdr->modified, sizeof(fhdr->modified)); - if( update && - lseek(fd, sz + (char*)&fhdr->recommend - (char*)fhdr, - SEEK_SET) >= 0 ) - { - // 如果 lseek 失敗就不會 write - read(fd, &fhdr->recommend, sizeof(fhdr->recommend)); - fhdr->recommend += update; - lseek(fd, -1, SEEK_CUR); - write(fd, &fhdr->recommend, sizeof(fhdr->recommend)); - } - close(fd); - // mark my self as "read this file". brc_addlist(fhdr->filename, fhdr->modified); } + return 0; } diff --git a/mbbsd/board.c b/mbbsd/board.c index 3f4e4810..b6278432 100644 --- a/mbbsd/board.c +++ b/mbbsd/board.c @@ -207,6 +207,7 @@ b_config(void) while(!finished) { move(ytitle +2, 0); + clrtobot(); prints(" 中文敘述: %s\n", bp->title); prints(" 板主名單: %s\n", (bp->BM[0] > ' ')? bp->BM : "(無)"); diff --git a/mbbsd/screen.c b/mbbsd/screen.c index b4550869..7d512aca 100644 --- a/mbbsd/screen.c +++ b/mbbsd/screen.c @@ -357,7 +357,9 @@ outc(unsigned char c) slp->data[cur_col] = '\0'; slp->len = cur_col + 1; } - if (slp->data[cur_col] != c) { + + // flush ANSI escapes everytime. + if (c == ESC_CHR || slp->data[cur_col] != c) { slp->data[cur_col] = c; if (!(slp->mode & MODIFIED)) slp->smod = slp->emod = cur_col; diff --git a/mbbsd/vote.c b/mbbsd/vote.c index 0a91f3f2..9c3259cb 100644 --- a/mbbsd/vote.c +++ b/mbbsd/vote.c @@ -808,7 +808,7 @@ user_vote_one(vote_buffer_t *vbuf, const char *bname, int ind) fclose(lfp); if (cuser.firstlogin > closetime || cuser.numposts < limits_posts || cuser.numlogins < limits_logins) { - vmsg("你不夠資深喔！ (可在看板內按大寫 I 查看限制)"); + vmsg("你不夠資深喔！"); return FULLUPDATE; } } -- cgit v1.2.3