summaryrefslogtreecommitdiffstats
path: root/mbbsd/mail.c
diff options
context:
space:
mode:
authorptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-04-27 06:19:44 +0800
committerptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-04-27 06:19:44 +0800
commit09818c65b333c5cb4b2618ed2b8d718147ce89b5 (patch)
treefe0f2e0fdbfaaa1d3fff43af4a439671d227c2ae /mbbsd/mail.c
parent32c93d1f6ea3f431340fb2965647bf5922d728c2 (diff)
downloadpttbbs-09818c65b333c5cb4b2618ed2b8d718147ce89b5.tar
pttbbs-09818c65b333c5cb4b2618ed2b8d718147ce89b5.tar.gz
pttbbs-09818c65b333c5cb4b2618ed2b8d718147ce89b5.tar.bz2
pttbbs-09818c65b333c5cb4b2618ed2b8d718147ce89b5.tar.lz
pttbbs-09818c65b333c5cb4b2618ed2b8d718147ce89b5.tar.xz
pttbbs-09818c65b333c5cb4b2618ed2b8d718147ce89b5.tar.zst
pttbbs-09818c65b333c5cb4b2618ed2b8d718147ce89b5.zip
rewrite functions to fit now i_read()
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@1865 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'mbbsd/mail.c')
-rw-r--r--mbbsd/mail.c53
1 files changed, 18 insertions, 35 deletions
diff --git a/mbbsd/mail.c b/mbbsd/mail.c
index 6198004b..4e2b9389 100644
--- a/mbbsd/mail.c
+++ b/mbbsd/mail.c
@@ -700,26 +700,18 @@ read_new_mail(fileheader_t * fptr)
while (!done) {
int more_result = more(fname, YEA);
- switch (more_result) {
- case 1:
- return READ_PREV;
- case 2:
- return RELATE_PREV;
- case 3:
- return READ_NEXT;
- case 4:
- return RELATE_NEXT;
- case 5:
- return RELATE_FIRST;
- case 6:
- return 0;
- case 7:
+ switch (more_result) {
+ case 999:
mail_reply(idc, fptr, currmaildir);
- return FULLUPDATE;
- case 8:
- multi_reply(idc, fptr, currmaildir);
- return FULLUPDATE;
- }
+ return FULLUPDATE;
+ case -1:
+ return READ_SKIP;
+ case 0:
+ break;
+ default:
+ return more_result;
+ }
+
outmsg(msg_mailer);
switch (igetch()) {
@@ -875,24 +867,15 @@ mail_read(int ent, fileheader_t * fhdr, char *direct)
substitute_record(currmaildir, fhdr, sizeof(*fhdr), ent);
}
switch (more_result) {
- case 1:
- return READ_PREV;
- case 2:
- return RELATE_PREV;
- case 3:
- return READ_NEXT;
- case 4:
- return RELATE_NEXT;
- case 5:
- return RELATE_FIRST;
- case 6:
- return FULLUPDATE;
- case 7:
+ case 999:
mail_reply(ent, fhdr, direct);
return FULLUPDATE;
- case 8:
- multi_reply(ent, fhdr, direct);
- return FULLUPDATE;
+ case -1:
+ return READ_SKIP;
+ case 0:
+ break;
+ default:
+ return more_result;
}
outmsg(msg_mailer);