summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2005-09-09 21:23:13 +0800
committerpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2005-09-09 21:23:13 +0800
commit4e23baabfaa4661b58dac17128e91d761df18ab3 (patch)
tree178a9c4718bdeebd2758e7ac0cfc5f52dd949380
parent83191c06b40c522464f7021cb25cc2367375f1ce (diff)
downloadpttbbs-4e23baabfaa4661b58dac17128e91d761df18ab3.tar
pttbbs-4e23baabfaa4661b58dac17128e91d761df18ab3.tar.gz
pttbbs-4e23baabfaa4661b58dac17128e91d761df18ab3.tar.bz2
pttbbs-4e23baabfaa4661b58dac17128e91d761df18ab3.tar.lz
pttbbs-4e23baabfaa4661b58dac17128e91d761df18ab3.tar.xz
pttbbs-4e23baabfaa4661b58dac17128e91d761df18ab3.tar.zst
pttbbs-4e23baabfaa4661b58dac17128e91d761df18ab3.zip
try to make FILE_MULTI work, (ref: #221/#220)
hmmm, after almost three thousands of patchsets, finally it may work now ... (hope so, not really tried, and i don't care actually) git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3146 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--include/pttstruct.h15
-rw-r--r--mbbsd/mail.c3
2 files changed, 7 insertions, 11 deletions
diff --git a/include/pttstruct.h b/include/pttstruct.h
index 8a33b22b..3bad958c 100644
--- a/include/pttstruct.h
+++ b/include/pttstruct.h
@@ -263,19 +263,18 @@ typedef struct fileheader_t {
unsigned char filemode; /* must be last field @ boards.c */
} fileheader_t;
-#define FILE_LOCAL 0x1 /* local saved */
-#define FILE_READ 0x1 /* already read : mail only */
-#define FILE_MARKED 0x2 /* opus: 0x8 */
+#define FILE_LOCAL 0x1 /* local saved, non-mail */
+#define FILE_READ 0x1 /* already read, mail only */
+#define FILE_MARKED 0x2 /* opus: 0x8 <- what? */
#define FILE_DIGEST 0x4 /* digest */
-#define FILE_BOTTOM 0x8 /* push_bottom */
-#define FILE_SOLVED 0x10 /* problem solved, sysop/BM only */
+#define FILE_BOTTOM 0x8 /* push_bottom, non-mail */
+#define FILE_MULTI 0x8 /* multi send, mail only */
+#define FILE_SOLVED 0x10 /* problem solved, sysop/BM only */
#define FILE_HIDE 0x20 /* hide, in announce */
#define FILE_BID 0x20 /* bid, in non-announce */
#define FILE_BM 0x40 /* BM only, in announce */
#define FILE_VOTE 0x40 /* for vote, in non-announce */
-#define FILE_ANONYMOUS 0x80 /* anonymous file */
-/* TODO filemode is unsigned, IS THIS MULTI CORRECT? DANGEROUS!!! */
-#define FILE_MULTI 0x100 /* multi send for mail */
+#define FILE_ANONYMOUS 0x80 /* anonymous file */
#define STRLEN 80 /* Length of most string data */
diff --git a/mbbsd/mail.c b/mbbsd/mail.c
index e15cfd5c..889c1f48 100644
--- a/mbbsd/mail.c
+++ b/mbbsd/mail.c
@@ -610,7 +610,6 @@ multi_send(char *title)
strlcpy(mymail.owner, cuser.userid, sizeof(mymail.owner));
strlcpy(mymail.title, save_title, sizeof(mymail.title));
- /* TODO is this really going to work!?!?!? */
mymail.filemode |= FILE_MULTI; /* multi-send flag */
sethomedir(genbuf, p->word);
if (append_record_forward(genbuf, &mymail, sizeof(mymail), p->word) == -1)
@@ -627,8 +626,6 @@ multi_send(char *title)
static int
multi_reply(int ent, fileheader_t * fhdr, const char *direct)
{
- /* this is not going to work because FILE_MULTI
- * exceeds filemode data width. */
if (!(fhdr->filemode & FILE_MULTI))
return mail_reply(ent, fhdr, direct);