summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2005-07-06 20:15:00 +0800
committerpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2005-07-06 20:15:00 +0800
commit60055c15a2ef4934a0571f2aa8eeeb3fbda37275 (patch)
treea515a9715351c955555c89096544b5ca3380b400
parentd3dbb71b0dffe5ae7ca08d981d2dfa1fa268d0b7 (diff)
downloadpttbbs-60055c15a2ef4934a0571f2aa8eeeb3fbda37275.tar
pttbbs-60055c15a2ef4934a0571f2aa8eeeb3fbda37275.tar.gz
pttbbs-60055c15a2ef4934a0571f2aa8eeeb3fbda37275.tar.bz2
pttbbs-60055c15a2ef4934a0571f2aa8eeeb3fbda37275.tar.lz
pttbbs-60055c15a2ef4934a0571f2aa8eeeb3fbda37275.tar.xz
pttbbs-60055c15a2ef4934a0571f2aa8eeeb3fbda37275.tar.zst
pttbbs-60055c15a2ef4934a0571f2aa8eeeb3fbda37275.zip
pmore: avoid dbcs cursor movement doubled due to msg format
mail: fix ticket#14 git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2906 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--mbbsd/mail.c13
-rw-r--r--mbbsd/pmore.c2
2 files changed, 9 insertions, 6 deletions
diff --git a/mbbsd/mail.c b/mbbsd/mail.c
index e0195689..8fd6e36c 100644
--- a/mbbsd/mail.c
+++ b/mbbsd/mail.c
@@ -271,11 +271,14 @@ do_send(const char *userid, const char *title)
if (!(xuser.userlevel & PERM_READMAIL))
return -3;
- if (!title)
- getdata(2, 0, "主題:", save_title, STRLEN - 20, DOECHO);
curredit |= EDIT_MAIL;
curredit &= ~EDIT_ITEM;
}
+ /* process title */
+ if (title)
+ strncpy(save_title, title, STRLEN-1);
+ else
+ getdata(2, 0, "主題:", save_title, STRLEN - 20, DOECHO);
setutmpmode(SMAIL);
@@ -291,7 +294,7 @@ do_send(const char *userid, const char *title)
}
clear();
prints("信件即將寄給 %s\n標題為:%s\n確定要寄出嗎? (Y/N) [Y]",
- userid, title);
+ userid, save_title);
ch = igetch();
switch (ch) {
case 'N':
@@ -303,9 +306,9 @@ do_send(const char *userid, const char *title)
outs("Y\n請稍候, 信件傳遞中...\n");
res =
#ifndef USE_BSMTP
- bbs_sendmail(fpath, title, userid);
+ bbs_sendmail(fpath, save_title, userid);
#else
- bsmtp(fpath, title, userid, 0);
+ bsmtp(fpath, save_title, userid, 0);
#endif
hold_mail(fpath, userid);
}
diff --git a/mbbsd/pmore.c b/mbbsd/pmore.c
index 03433603..c8f1ded3 100644
--- a/mbbsd/pmore.c
+++ b/mbbsd/pmore.c
@@ -1884,7 +1884,7 @@ pmore(char *fpath, int promptend)
if(postfix1len > 0)
outs(
mf_viewedAll() ?
- ANSI_COLOR(0;31;47)" (y)" ANSI_COLOR(30) "回信"
+ ANSI_COLOR(0;31;47)"(y)" ANSI_COLOR(30) "回信"
ANSI_COLOR(31) "(X)" ANSI_COLOR(30) "推文 "
:
ANSI_COLOR(0;31;47) "(h)"