summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvictor <victor@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2003-03-18 22:27:13 +0800
committervictor <victor@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2003-03-18 22:27:13 +0800
commit3ccf26f9733059a4b04a27678629bd764a091c55 (patch)
treef02da7c9bad3bcef2228dd4e363d15a95457f9c0
parente867f159ccc71da85abb336417ce6b6769bf80ba (diff)
downloadpttbbs-3ccf26f9733059a4b04a27678629bd764a091c55.tar
pttbbs-3ccf26f9733059a4b04a27678629bd764a091c55.tar.gz
pttbbs-3ccf26f9733059a4b04a27678629bd764a091c55.tar.bz2
pttbbs-3ccf26f9733059a4b04a27678629bd764a091c55.tar.lz
pttbbs-3ccf26f9733059a4b04a27678629bd764a091c55.tar.xz
pttbbs-3ccf26f9733059a4b04a27678629bd764a091c55.tar.zst
pttbbs-3ccf26f9733059a4b04a27678629bd764a091c55.zip
do_allpost after edit_postbbs.c
git-svn-id: http://opensvn.csie.org/pttbbs/pttbbs/trunk/pttbbs@701 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--mbbsd/bbs.c77
1 files changed, 49 insertions, 28 deletions
diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c
index 2d498b59..5c0b914b 100644
--- a/mbbsd/bbs.c
+++ b/mbbsd/bbs.c
@@ -1,4 +1,4 @@
-/* $Id: bbs.c,v 1.80 2003/03/05 10:42:03 victor Exp $ */
+/* $Id: bbs.c,v 1.81 2003/03/18 14:27:13 victor Exp $ */
#include "bbs.h"
static void
@@ -397,6 +397,35 @@ static time_t last_post_time = 0;
static time_t water_counts = 0;
#endif
+void
+do_allpost(fileheader_t *postfile, const char *fpath, const char *owner)
+{
+ char genbuf[200];
+
+ setbpath(genbuf, ALLPOST);
+ stampfile(genbuf, postfile);
+ unlink(genbuf);
+
+ /* jochang: boards may spread across many disk */
+ /*
+ * link doesn't work across device, Link doesn't work if we have
+ * same-time-across-device posts, we try symlink now
+ */
+ {
+ /* we need absolute path for symlink */
+ char abspath[256] = BBSHOME "/";
+ strcat(abspath, fpath);
+ symlink(abspath, genbuf);
+ }
+ strlcpy(postfile->owner, owner, sizeof(postfile->owner));
+ strlcpy(postfile->title, save_title, sizeof(postfile->title));
+ postfile->filemode = FILE_LOCAL;
+ setbdir(genbuf, ALLPOST);
+ if (append_record(genbuf, postfile, sizeof(fileheader_t)) != -1) {
+ setbtotal(getbnum(ALLPOST));
+ }
+}
+
static int
do_general()
{
@@ -517,28 +546,7 @@ do_general()
if (!(currbrdattr & BRD_HIDE) &&
(!bp->level || (currbrdattr & BRD_POSTMASK))) {
- setbpath(genbuf, ALLPOST);
- stampfile(genbuf, &postfile);
- unlink(genbuf);
-
- /* jochang: boards may spread across many disk */
- /*
- * link doesn't work across device, Link doesn't work if we have
- * same-time-across-device posts, we try symlink now
- */
- {
- /* we need absolute path for symlink */
- char abspath[256] = BBSHOME "/";
- strcat(abspath, fpath);
- symlink(abspath, genbuf);
- }
- strlcpy(postfile.owner, owner, sizeof(postfile.owner));
- strlcpy(postfile.title, save_title, sizeof(postfile.title));
- postfile.filemode = FILE_LOCAL;
- setbdir(genbuf, ALLPOST);
- if (append_record(genbuf, &postfile, sizeof(postfile)) != -1) {
- setbtotal(getbnum(ALLPOST));
- }
+ do_allpost(&postfile, fpath, owner);
}
outs("順利貼出佈告,");
@@ -699,7 +707,9 @@ reply_post(int ent, fileheader_t * fhdr, char *direct)
static int
edit_post(int ent, fileheader_t * fhdr, char *direct)
{
+ char fpath[80], fpath0[80];
char genbuf[200];
+ fileheader_t postfile;
boardheader_t *bp;
bp = getbcache(currbid);
if (strcmp(bp->brdname, "Security") == 0)
@@ -718,32 +728,43 @@ edit_post(int ent, fileheader_t * fhdr, char *direct)
setutmpmode(REEDIT);
setdirpath(genbuf, direct, fhdr->filename);
local_article = fhdr->filemode & FILE_LOCAL;
+ strlcpy(save_title, fhdr->title, sizeof(save_title));
/* rocker.011018: 這裡是不是該檢查一下修改文章後的money和原有的比較? */
if (vedit(genbuf, 0, NULL) != -1) {
lock_substitute_record(direct, fhdr, sizeof(*fhdr), ent, LOCK_EX);
+ setbpath(fpath, currboard);
+ stampfile(fpath, &postfile);
+ unlink(fpath);
+ setbfile(fpath0, currboard, fhdr->filename);
+
+ Rename(fpath0, fpath);
/* rocker.011018: fix 串接模式改文章後文章就不見的bug */
if ((currmode & MODE_SELECT) && (fhdr->money & FHR_REFERENCE)) {
fileheader_t hdr;
- char fpath[80];
int num;
num = fhdr->money & ~FHR_REFERENCE;
- setbdir(fpath, currboard);
- get_record(fpath, &hdr, sizeof(hdr), num);
+ setbdir(fpath0, currboard);
+ get_record(fpath0, &hdr, sizeof(hdr), num);
/* 再這裡要check一下原來的dir裡面是不是有被人動過... */
if (!strcmp(hdr.filename, fhdr->filename)) {
- strlcpy(hdr.filename, fhdr->filename, sizeof(hdr.filename));
+ strlcpy(hdr.filename, postfile.filename, sizeof(hdr.filename));
strlcpy(hdr.title, save_title, sizeof(hdr.title));
- substitute_record(fpath, &hdr, sizeof(hdr), num);
+ substitute_record(fpath0, &hdr, sizeof(hdr), num);
}
}
+ strlcpy(fhdr->filename, postfile.filename, sizeof(fhdr->filename));
+ strlcpy(fhdr->title, save_title, sizeof(fhdr->title));
+ brc_addlist(postfile.filename);
lock_substitute_record(direct, fhdr, sizeof(*fhdr), ent, LOCK_UN);
/* rocker.011018: 順便更新一下cache */
touchdircache(currbid);
}
+
+ do_allpost(&postfile, fpath, cuser.userid);
return FULLUPDATE;
}