summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2010-11-03 19:00:12 +0800
committerpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2010-11-03 19:00:12 +0800
commit85fdef5e6ad85d0228b830e58beebaf756f02b42 (patch)
treea4d498bd30aa3fefbb10c601bd014c32ff765c92
parent6048c27afa70e732919f619db17fb34803e98888 (diff)
downloadpttbbs-85fdef5e6ad85d0228b830e58beebaf756f02b42.tar
pttbbs-85fdef5e6ad85d0228b830e58beebaf756f02b42.tar.gz
pttbbs-85fdef5e6ad85d0228b830e58beebaf756f02b42.tar.bz2
pttbbs-85fdef5e6ad85d0228b830e58beebaf756f02b42.tar.lz
pttbbs-85fdef5e6ad85d0228b830e58beebaf756f02b42.tar.xz
pttbbs-85fdef5e6ad85d0228b830e58beebaf756f02b42.tar.zst
pttbbs-85fdef5e6ad85d0228b830e58beebaf756f02b42.zip
fix: fail when deleting files recovered by recycle bin
git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5204 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--pttbbs/mbbsd/bbs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/pttbbs/mbbsd/bbs.c b/pttbbs/mbbsd/bbs.c
index 2b1f07ab..3af50a22 100644
--- a/pttbbs/mbbsd/bbs.c
+++ b/pttbbs/mbbsd/bbs.c
@@ -835,11 +835,11 @@ cancelpost2(const fileheader_t *fh, char *newpath, size_t sznewpath) {
if(!fh->filename[0])
return -1;
+ setbfile(fpath, currboard, fh->filename);
+ // if (!dashf(fpath)) return -1;
+
// TODO touch modify time to now? save the name who deleted it?
if (strncmp(fh->owner, RECYCLE_BIN_OWNER, strlen(RECYCLE_BIN_OWNER)) != 0) {
-
- setbfile(fpath, currboard, fh->filename);
- // if (!dashf(fpath)) return -1;
log_filef(fpath, LOG_CREAT, "\n¡° Deleted by: %s (%s) %s",
cuser.userid, fromhost, Cdatelite(&now));