summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorin2 <in2@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2002-11-07 00:25:15 +0800
committerin2 <in2@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2002-11-07 00:25:15 +0800
commit3135cf3e37a4b5fbd7b7b4e7a67b66c47d0e1e3a (patch)
tree772cecc4731614e9df09367ab0d5f0f8654be4b4
parent175ba7e7cf70d131d34fd8c09a3138e7f9dfeea0 (diff)
downloadpttbbs-3135cf3e37a4b5fbd7b7b4e7a67b66c47d0e1e3a.tar
pttbbs-3135cf3e37a4b5fbd7b7b4e7a67b66c47d0e1e3a.tar.gz
pttbbs-3135cf3e37a4b5fbd7b7b4e7a67b66c47d0e1e3a.tar.bz2
pttbbs-3135cf3e37a4b5fbd7b7b4e7a67b66c47d0e1e3a.tar.lz
pttbbs-3135cf3e37a4b5fbd7b7b4e7a67b66c47d0e1e3a.tar.xz
pttbbs-3135cf3e37a4b5fbd7b7b4e7a67b66c47d0e1e3a.tar.zst
pttbbs-3135cf3e37a4b5fbd7b7b4e7a67b66c47d0e1e3a.zip
editlock by flock()
git-svn-id: http://opensvn.csie.org/pttbbs/pttbbs/trunk/pttbbs@558 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--include/proto.h3
-rw-r--r--mbbsd/bbs.c34
-rw-r--r--mbbsd/edit.c38
-rw-r--r--mbbsd/record.c34
4 files changed, 50 insertions, 59 deletions
diff --git a/include/proto.h b/include/proto.h
index e4e910d7..1c72178c 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -1,4 +1,4 @@
-/* $Id: proto.h,v 1.29 2002/08/25 07:13:53 in2 Exp $ */
+/* $Id: proto.h,v 1.30 2002/11/06 16:25:14 in2 Exp $ */
#ifndef INCLUDE_PROTO_H
#define INCLUDE_PROTO_H
@@ -346,6 +346,7 @@ void EnumTagFhdr(fileheader_t *fhdr, char *direct, int locus);
void UnTagger (int locus);
/* record */
int substitute_record(char *fpath, void *rptr, int size, int id);
+int lock_substitute_record(char *fpath, void *rptr, int size, int id, int);
int get_record(char *fpath, void *rptr, int size, int id);
void prints(char *fmt, ...);
int append_record(char *fpath, fileheader_t *record, int size);
diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c
index dbe9936d..f32f5b91 100644
--- a/mbbsd/bbs.c
+++ b/mbbsd/bbs.c
@@ -1,4 +1,4 @@
-/* $Id: bbs.c,v 1.70 2002/08/25 18:43:36 in2 Exp $ */
+/* $Id: bbs.c,v 1.71 2002/11/06 16:25:14 in2 Exp $ */
#include "bbs.h"
static void
@@ -718,11 +718,9 @@ edit_post(int ent, fileheader_t * fhdr, char *direct)
local_article = fhdr->filemode & FILE_LOCAL;
strlcpy(save_title, fhdr->title, sizeof(save_title));
- if( iseditlocking(genbuf, "重複編輯") )
- return FULLUPDATE;
- editlock(genbuf);
/* 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);
@@ -749,11 +747,10 @@ edit_post(int ent, fileheader_t * fhdr, char *direct)
strlcpy(fhdr->filename, postfile.filename, sizeof(fhdr->filename));
strlcpy(fhdr->title, save_title, sizeof(fhdr->title));
brc_addlist(postfile.filename);
- substitute_record(direct, fhdr, sizeof(*fhdr), ent);
+ lock_substitute_record(direct, fhdr, sizeof(*fhdr), ent, LOCK_UN);
/* rocker.011018: 順便更新一下cache */
touchdircache(currbid);
}
- editunlock(genbuf);
return FULLUPDATE;
}
@@ -1209,21 +1206,19 @@ recommend(int ent, fileheader_t * fhdr, char *direct)
boardheader_t *bp;
bp = getbcache(currbid);
- if (!(currmode & MODE_POST) || !strcmp(fhdr->owner, cuser.userid) ||
- bp->brdattr & BRD_VOTEBOARD) {
+ if (!(currmode & MODE_POST) || bp->brdattr & BRD_VOTEBOARD) {
move(b_lines - 1, 0);
- prints("您因權限不足無法推薦 或 不能推薦自己的文章!");
+ prints("您因權限不足無法推薦!");
pressanykey();
return FULLUPDATE;
}
setdirpath(path, direct, fhdr->filename);
- if( iseditlocking(path, "推薦文章") )
- return FULLUPDATE;
if (fhdr->recommend > 9 || fhdr->recommend < 0)
/* 暫時性的 code 原來舊有值取消 */
fhdr->recommend = 0;
+#if 0
#ifndef DEBUG
if (!(currmode & MODE_BOARD) && getuser(cuser.userid) &&
now - xuser.recommend < 60) {
@@ -1233,6 +1228,8 @@ recommend(int ent, fileheader_t * fhdr, char *direct)
return FULLUPDATE;
}
#endif
+#endif
+
if (!getdata(b_lines - 2, 0, "推薦語:", path, 40, DOECHO) ||
!getdata(b_lines - 1, 0, "確定要推薦, 請仔細考慮(Y/N)?[n] ", yn, 5, LCECHO)
|| yn[0] != 'y')
@@ -1243,20 +1240,22 @@ recommend(int ent, fileheader_t * fhdr, char *direct)
cuser.userid, path,
51 - strlen(cuser.userid) - strlen(path), " ", fromhost,
ptime->tm_mon + 1, ptime->tm_mday);
- if( iseditlocking(path, "推薦文章") )
- return FULLUPDATE;
+ lock_substitute_record(direct, fhdr, sizeof(*fhdr), ent, LOCK_EX);
setdirpath(path, direct, fhdr->filename);
log_file(path, buf);
- if (fhdr->recommend < 9) {
+ if (!(fhdr->recommend < 9))
+ lock_substitute_record(direct, fhdr, sizeof(*fhdr), ent, LOCK_UN);
+ else{
fhdr->recommend++;
cuser.recommend = now;
passwd_update(usernum, &cuser);
- substitute_record(direct, fhdr, sizeof(*fhdr), ent);
+ lock_substitute_record(direct, fhdr, sizeof(*fhdr), ent, LOCK_UN);
substitute_check(fhdr);
touchdircache(currbid);
}
return FULLUPDATE;
}
+
static int
mark_post(int ent, fileheader_t * fhdr, char *direct)
{
@@ -1370,12 +1369,7 @@ del_post(int ent, fileheader_t * fhdr, char *direct)
getdata(1, 0, msg_del_ny, genbuf, 3, LCECHO);
if (genbuf[0] == 'y' || genbuf[0] == 'Y') {
strlcpy(currfile, fhdr->filename, sizeof(currfile));
-
- setbfile(genbuf, currboard, fhdr->filename);
- if( iseditlocking(genbuf, "刪除文章") )
- return FULLUPDATE;
if (!delete_file(direct, sizeof(fileheader_t), ent, cmpfilename)) {
-
if (currmode & MODE_SELECT) {
/* rocker.011018: 利用reference減低loading */
fileheader_t hdr;
diff --git a/mbbsd/edit.c b/mbbsd/edit.c
index 8685dfc5..f560167d 100644
--- a/mbbsd/edit.c
+++ b/mbbsd/edit.c
@@ -1,4 +1,4 @@
-/* $Id: edit.c,v 1.20 2002/10/26 03:54:15 in2 Exp $ */
+/* $Id: edit.c,v 1.21 2002/11/06 16:25:15 in2 Exp $ */
#include "bbs.h"
typedef struct textline_t {
struct textline_t *prev;
@@ -2290,39 +2290,3 @@ vedit(char *fpath, int saveheader, int *islocal)
}
}
-void editlock(char *fpath)
-{
- char fn[256];
- FILE *fp;
- snprintf(fn, sizeof(fn), "%s.lock", fpath);
- if( (fp = fopen(fn, "w")) != NULL ){
- fprintf(fp, "%d\n", currpid);
- fclose(fp);
- }
-}
-
-void editunlock(char *fpath)
-{
- char fn[256];
- snprintf(fn, sizeof(fn), "%s.lock", fpath);
- unlink(fn);
-}
-
-int iseditlocking(char *fpath, char *action)
-{
- char fn[256];
- FILE *fp;
- snprintf(fn, sizeof(fn), "%s.lock", fpath);
- if( (fp = fopen(fn, "r")) != NULL ){
- int pid;
- fscanf(fp, "%d", &pid);
- fclose(fp);
- if( kill(pid, 0) >= 0 ){
- vmsg("文章編修中, 暫時無法%s", action);
- return 1;
- }
- else
- unlink(fn);
- }
- return 0;
-}
diff --git a/mbbsd/record.c b/mbbsd/record.c
index bd0c5316..13db0da6 100644
--- a/mbbsd/record.c
+++ b/mbbsd/record.c
@@ -1,4 +1,4 @@
-/* $Id: record.c,v 1.10 2002/07/22 19:02:00 in2 Exp $ */
+/* $Id: record.c,v 1.11 2002/11/06 16:25:15 in2 Exp $ */
#include "bbs.h"
#undef HAVE_MMAP
@@ -91,6 +91,38 @@ get_records(char *fpath, void *rptr, int size, int id, int number)
}
int
+lock_substitute_record(char *fpath, void *rptr, int size, int id, int mode)
+{
+ static int fd = -1;
+ switch( mode ){
+ case LOCK_EX:
+ if( id < 1 || (fd = open(fpath, O_RDWR | O_CREAT, 0644)) == -1 )
+ return -1;
+
+ if( flock(fd, LOCK_EX) < 0 ){
+ close(fd);
+ return -1;
+ }
+ lseek(fd, (off_t) (size * (id - 1)), SEEK_SET);
+ read(fd, rptr, size);
+ return 0;
+
+ case LOCK_UN:
+ if( fd < 0 )
+ return -1;
+ lseek(fd, (off_t) (size * (id - 1)), SEEK_SET);
+ write(fd, rptr, size);
+ flock(fd, LOCK_UN);
+ close(fd);
+ fd = -1;
+ return 0;
+
+ default:
+ return -1;
+ }
+}
+
+int
substitute_record(char *fpath, void *rptr, int size, int id)
{
int fd;