From 6cd1e2dd9904da07992c18b77f0586a4d77b61de Mon Sep 17 00:00:00 2001 From: in2 Date: Mon, 15 Dec 2003 09:53:37 +0000 Subject: add SAFE_ARTICLE_DELETE, when using 'd' to delete an article, do not truncate .DIR immediately but add an empty record into the same place. this avoids many problems. (not complete yet) git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@1407 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- mbbsd/bbs.c | 13 ++++++++++++- mbbsd/record.c | 13 +++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) (limited to 'mbbsd') diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c index a0385552..659e6544 100644 --- a/mbbsd/bbs.c +++ b/mbbsd/bbs.c @@ -947,6 +947,11 @@ edit_post(int ent, fileheader_t * fhdr, char *direct) if( currmode & MODE_SELECT ) return DONOTHING; +#ifdef SAFE_ARTICLE_DELETE + if( fhdr->filename[0] == '.' ) + return DONOTHING; +#endif + setutmpmode(REEDIT); setdirpath(genbuf, direct, fhdr->filename); local_article = fhdr->filemode & FILE_LOCAL; @@ -1833,7 +1838,13 @@ del_post(int ent, fileheader_t * fhdr, char *direct) getdata(1, 0, msg_del_ny, genbuf, 3, LCECHO); if (genbuf[0] == 'y') { strlcpy(currfile, fhdr->filename, sizeof(currfile)); - if (!delete_file(direct, sizeof(fileheader_t), ent, cmpfilename)) { + if( +#ifdef SAFE_ARTICLE_DELETE + !safe_article_delete(ent, fhdr, direct) +#else + !delete_file(direct, sizeof(fileheader_t), ent, cmpfilename) +#endif + ) { int num; if (currmode & MODE_SELECT) { /* rocker.011018: 利用reference減低loading */ diff --git a/mbbsd/record.c b/mbbsd/record.c index e4c2897f..c28a0c6d 100644 --- a/mbbsd/record.c +++ b/mbbsd/record.c @@ -400,6 +400,19 @@ int delete_files(char *dirname, int (*filecheck) (), int record){ return ans; } +#ifdef SAFE_ARTICLE_DELETE +int +safe_article_delete(int ent, fileheader_t *fhdr, char *direct) +{ + fileheader_t newfhdr; + memcpy(&newfhdr, fhdr, sizeof(fileheader_t)); + sprintf(newfhdr.title, "(本文已被刪除)"); + strcpy(newfhdr.filename, ".deleted"); + substitute_record(direct, &newfhdr, sizeof(newfhdr), ent); + return 0; +} +#endif + int delete_file(char *dirname, int size, int ent, int (*filecheck) ()) { -- cgit v1.2.3