1998-10-10 04:29:27 +00:00
|
|
|
|
--- pine/send.c.orig Wed Sep 16 03:12:31 1998
|
|
|
|
|
+++ pine/send.c Tue Sep 22 11:56:19 1998
|
|
|
|
|
@@ -211,18 +211,18 @@
|
|
|
|
|
* Various useful strings
|
|
|
|
|
*/
|
1998-08-09 00:51:28 +00:00
|
|
|
|
#define INTRPT_PMT \
|
|
|
|
|
- "Continue INTERRUPTED composition (answering \"n\" won't erase it)"
|
|
|
|
|
+ "<22>~<7E><><EFBFBD>s<EFBFBD><73><EFBFBD>W<EFBFBD><57><EFBFBD><EFBFBD><EFBFBD>_<EFBFBD><5F><EFBFBD>峹<EFBFBD>ܡ]<5D>^<5E><> \"<22>_\" <20>N<EFBFBD><4E><EFBFBD>|<7C>R<EFBFBD><52><EFBFBD><EFBFBD><EFBFBD>^"
|
|
|
|
|
#define PSTPND_PMT \
|
|
|
|
|
- "Continue postponed composition (answering \"No\" won't erase it)"
|
|
|
|
|
+ "<22>~<7E><><EFBFBD>s<EFBFBD><73><EFBFBD>D<EFBFBD>Ƚw<C8BD><77><EFBFBD>峹<EFBFBD>ܡ]<5D>^<5E><> \"<22>_\" <20>N<EFBFBD><4E><EFBFBD>|<7C>R<EFBFBD><52><EFBFBD><EFBFBD><EFBFBD>^"
|
|
|
|
|
#define FORM_PMT \
|
|
|
|
|
- "Start composition from Form Letter Folder"
|
|
|
|
|
+ "<22>}<7D>l<EFBFBD>ۨӷ<DBA8><D3B7>H<EFBFBD><48><EFBFBD>X<EFBFBD><58><EFBFBD>s<EFBFBD><73>"
|
1998-10-10 04:29:27 +00:00
|
|
|
|
#define PSTPN_FORM_PMT \
|
1998-08-09 00:51:28 +00:00
|
|
|
|
- "Save to Postponed or Form letter folder? "
|
|
|
|
|
+ "<22>n<EFBFBD>s<EFBFBD>ܡu<DCA1>Ƚw<C8BD>v<EFBFBD>Ρu<CEA1>ӷ<EFBFBD><D3B7>v<EFBFBD>H<EFBFBD><48><EFBFBD>X<EFBFBD>H"
|
|
|
|
|
#define POST_PMT \
|
|
|
|
|
- "Posted message may go to thousands of readers. Really post"
|
|
|
|
|
+ "<22>o<EFBFBD>g<EFBFBD>峹<EFBFBD>i<EFBFBD><69><EFBFBD>Q<EFBFBD>ƥH<C6A5>d<EFBFBD>p<EFBFBD><70>Ū<EFBFBD>̾\\Ū<>A<EFBFBD>T<EFBFBD>w<EFBFBD>n<EFBFBD>Z<EFBFBD>n<EFBFBD><6E>"
|
|
|
|
|
#define INTR_DEL_FAIL \
|
|
|
|
|
"Undelete messages to remain postponed, and then continue message"
|
|
|
|
|
-#define INTR_DEL_PMT "Deleted messages will be removed from folder. Delete"
|
|
|
|
|
+#define INTR_DEL_PMT "<22>R<EFBFBD><52><EFBFBD><EFBFBD><EFBFBD>H<EFBFBD><48><EFBFBD>N<EFBFBD>Q<EFBFBD><51><EFBFBD>X<EFBFBD>ɮקX<D7A7>C<EFBFBD>T<EFBFBD>w<EFBFBD>R<EFBFBD><52><EFBFBD><EFBFBD>"
|
|
|
|
|
|
1998-10-10 04:29:27 +00:00
|
|
|
|
#if defined(DOS) || defined(OS2)
|
|
|
|
|
#define POST_PERM_GRIPE \
|
|
|
|
|
@@ -382,14 +382,14 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
mail_close(stream);
|
|
|
|
|
if(ret == 'x'){
|
|
|
|
|
q_status_message(SM_ORDER, 0, 3,
|
|
|
|
|
- "Composition cancelled");
|
|
|
|
|
+ "<22><><EFBFBD><EFBFBD><EFBFBD>s<EFBFBD><73>");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
q_status_message1(SM_ORDER | SM_DING, 3, 3,
|
|
|
|
|
- "Can't open Interrupted mailbox: %s",
|
|
|
|
|
+ "<22>L<EFBFBD>k<EFBFBD>}<7D>Q<EFBFBD><51><EFBFBD>_<EFBFBD><5F><EFBFBD>H<EFBFBD>c<EFBFBD>G%s",
|
|
|
|
|
file_path);
|
|
|
|
|
if(stream)
|
|
|
|
|
mail_close(stream);
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -469,14 +469,14 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|
|
|
|
|
if(ret == 'x'){
|
|
|
|
|
q_status_message(SM_ORDER, 0, 3,
|
|
|
|
|
- "Composition cancelled");
|
|
|
|
|
+ "<22><><EFBFBD><EFBFBD><EFBFBD>s<EFBFBD><73>");
|
|
|
|
|
done++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
q_status_message1(SM_ORDER | SM_DING, 3, 3,
|
|
|
|
|
- "Can't open Postponed mailbox: %s", mbox);
|
|
|
|
|
+ "<22>L<EFBFBD>k<EFBFBD>}<7D>D<EFBFBD>Ƚw<C8BD><77><EFBFBD>H<EFBFBD>c<EFBFBD>G%s", mbox);
|
|
|
|
|
if(stream)
|
|
|
|
|
mail_close(stream);
|
|
|
|
|
}
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -562,7 +562,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|
|
|
|
|
if(ret == 'x'){
|
|
|
|
|
q_status_message(SM_ORDER, 0, 3,
|
|
|
|
|
- "Composition cancelled");
|
|
|
|
|
+ "<22><><EFBFBD><EFBFBD><EFBFBD>s<EFBFBD><73>");
|
|
|
|
|
done++;
|
|
|
|
|
}
|
|
|
|
|
}
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -572,7 +572,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
q_status_message1(SM_ORDER | SM_DING, 3, 3,
|
|
|
|
|
- "Can't open form letter folder: %s", mbox);
|
|
|
|
|
+ "<22>L<EFBFBD>k<EFBFBD>}<7D>Ҩӷ<D2A8><D3B7>H<EFBFBD><48><EFBFBD>X<EFBFBD>G %s", mbox);
|
|
|
|
|
if(stream)
|
|
|
|
|
mail_close(stream);
|
|
|
|
|
}
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -646,7 +646,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
fs_give((void **)&tmp_fcc);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- pine_send(outgoing, &body, "COMPOSE MESSAGE", fcc,
|
|
|
|
|
+ pine_send(outgoing, &body, "<22>s<EFBFBD><73><EFBFBD>H<EFBFBD><48>", fcc,
|
|
|
|
|
reply, redraft_pos, lcc, custom, fcc_is_sticky);
|
|
|
|
|
|
|
|
|
|
if(reply){
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -713,7 +713,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
*/
|
|
|
|
|
if(!stream->nmsgs){
|
|
|
|
|
q_status_message(SM_ORDER | SM_DING, 3, 5,
|
|
|
|
|
- "Empty folder. No messages really postponed!");
|
|
|
|
|
+ "<22>Ū<EFBFBD><C5AA>H<EFBFBD><48><EFBFBD>X<EFBFBD>C<EFBFBD>S<EFBFBD><53><EFBFBD>H<EFBFBD><48><EFBFBD>u<EFBFBD><75><EFBFBD>Q<EFBFBD>Ƚw<C8BD>I");
|
|
|
|
|
return(redraft_cleanup(stream, TRUE));
|
|
|
|
|
}
|
|
|
|
|
else if(stream == ps_global->mail_stream){
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -749,7 +749,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
mn_give(&msgmap);
|
|
|
|
|
|
|
|
|
|
if(rv){
|
|
|
|
|
- q_status_message(SM_ORDER, 0, 3, "Composition cancelled");
|
|
|
|
|
+ q_status_message(SM_ORDER, 0, 3, "<22><><EFBFBD><EFBFBD><EFBFBD>s<EFBFBD><73>");
|
|
|
|
|
(void) redraft_cleanup(stream, FALSE);
|
|
|
|
|
return(0); /* special case */
|
|
|
|
|
}
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -992,7 +992,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
if(b->type == TYPEMULTIPART){
|
|
|
|
|
if(strucmp(b->subtype, "mixed")){
|
|
|
|
|
q_status_message1(SM_INFO, 3, 4,
|
|
|
|
|
- "Converting Multipart/%s to Multipart/Mixed",
|
|
|
|
|
+ "<22>ഫ Multipart/%s <20><> Multipart/Mixed",
|
|
|
|
|
b->subtype);
|
|
|
|
|
fs_give((void **)&b->subtype);
|
|
|
|
|
b->subtype = cpystr("mixed");
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -1000,7 +1000,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
q_status_message2(SM_ORDER | SM_DING, 3, 4,
|
|
|
|
|
- "Unable to resume type %s/%s message",
|
|
|
|
|
+ "<22>L<EFBFBD>k<EFBFBD>~<7E><><EFBFBD>κA<CEBA><41> %s/%s <20><><EFBFBD>H<EFBFBD><48>",
|
|
|
|
|
body_types[b->type], b->subtype);
|
|
|
|
|
return(redraft_cleanup(stream, TRUE));
|
|
|
|
|
}
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -1014,7 +1014,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
set_mime_type_by_grope(&part->body, NULL);
|
|
|
|
|
if(part->body.type != TYPETEXT){
|
|
|
|
|
q_status_message2(SM_ORDER | SM_DING, 3, 4,
|
|
|
|
|
- "Unable to resume; first part is non-text: %s/%s",
|
|
|
|
|
+ "<22>L<EFBFBD>k<EFBFBD>~<7E><><EFBFBD>F<EFBFBD>Ĥ@<40><><EFBFBD><EFBFBD><EFBFBD>D<EFBFBD>¤<EFBFBD><C2A4>r<EFBFBD>G%s/%s",
|
|
|
|
|
body_types[part->body.type],
|
|
|
|
|
part->body.subtype);
|
|
|
|
|
return(redraft_cleanup(stream, TRUE));
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -1075,7 +1075,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|
|
|
|
|
if(stream == ps_global->mail_stream){
|
|
|
|
|
q_status_message1(SM_ORDER, 3, 7,
|
|
|
|
|
- "No more postponed messages, returning to \"%s\"",
|
|
|
|
|
+ "<22>S<EFBFBD><53><EFBFBD>D<EFBFBD>Ƚw<C8BD><77><EFBFBD>H<EFBFBD><48><EFBFBD>F<EFBFBD>A<EFBFBD>^<5E><> \"%s\"",
|
|
|
|
|
ps_global->inbox_name);
|
|
|
|
|
do_broach_folder(ps_global->inbox_name,
|
|
|
|
|
ps_global->context_list);
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -1096,7 +1096,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|
|
|
|
|
if(!(rv = mail_delete(stream, mbox)))
|
|
|
|
|
q_status_message1(SM_ORDER|SM_DING, 3, 3,
|
|
|
|
|
- "Can't delete: %s", mbox);
|
|
|
|
|
+ "<22>L<EFBFBD>k<EFBFBD>R<EFBFBD><52><EFBFBD>G %s", mbox);
|
|
|
|
|
|
|
|
|
|
fs_give((void **) &mbox);
|
|
|
|
|
success = rv > 0L;
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -1119,7 +1119,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
{
|
|
|
|
|
if(background_posting(FALSE)){
|
|
|
|
|
q_status_message1(SM_ORDER, 0, 3,
|
|
|
|
|
- "%s folder unavailable while background posting",
|
|
|
|
|
+ "%s <20>H<EFBFBD><48><EFBFBD>X<EFBFBD>b<EFBFBD>I<EFBFBD><49><EFBFBD>Z<EFBFBD>n<EFBFBD>ɵL<C9B5>k<EFBFBD>ϥ<EFBFBD>",
|
|
|
|
|
type);
|
|
|
|
|
return(failure);
|
|
|
|
|
}
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -1342,7 +1342,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|
|
|
|
|
if(rc == 1 || (rc == 0 && !answer)) {
|
|
|
|
|
q_status_message(SM_ORDER, 3, 4,
|
|
|
|
|
- "Send cancelled (User-id must be provided before sending)");
|
|
|
|
|
+ "<22><><EFBFBD><EFBFBD><EFBFBD>H<EFBFBD><48>(<28>H<EFBFBD><48><EFBFBD>e<EFBFBD><65><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѨϥΪ̥N<CCA5><4E>)");
|
|
|
|
|
return(0);
|
|
|
|
|
}
|
|
|
|
|
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -1431,7 +1431,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|
|
|
|
|
if(rc == 1 || (rc == 0 && !answer)) {
|
|
|
|
|
q_status_message(SM_ORDER, 3, 4,
|
|
|
|
|
- "Send cancelled (Host/domain name must be provided before sending)");
|
|
|
|
|
+ "<22><><EFBFBD><EFBFBD><EFBFBD>H<EFBFBD><48>(<28>H<EFBFBD><48><EFBFBD>e<EFBFBD><65><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>D<EFBFBD><44>/<2F><><EFBFBD><EFBFBD> <20>W<EFBFBD><57>)");
|
|
|
|
|
return(0);
|
|
|
|
|
}
|
|
|
|
|
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -1487,7 +1487,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|
|
|
|
|
if(rc == 1 || (rc == 0 && answer[0] == '\0')) {
|
|
|
|
|
q_status_message(SM_ORDER, 3, 4,
|
|
|
|
|
- "Send cancelled (SMTP server must be provided before sending)");
|
|
|
|
|
+ "<22><><EFBFBD><EFBFBD><EFBFBD>H<EFBFBD><48>(<28>H<EFBFBD><48><EFBFBD>e<EFBFBD><65><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> SMTP <20><><EFBFBD>A<EFBFBD><41>)");
|
|
|
|
|
return(0);
|
|
|
|
|
}
|
|
|
|
|
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -1514,31 +1514,31 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
*/
|
|
|
|
|
static struct headerentry he_template[]={
|
|
|
|
|
{"From : ", "From", h_composer_from, 10, 0, NULL,
|
|
|
|
|
- build_address, NULL, NULL, addr_book_compose, "To AddrBk",
|
|
|
|
|
+ build_address, NULL, NULL, addr_book_compose, "<22>a<EFBFBD>}ï",
|
|
|
|
|
0, 1, 0, 1, 0, 1, 0, 0, 0, 0, KS_TOADDRBOOK},
|
|
|
|
|
{"Reply-To: ", "Reply To", h_composer_reply_to, 10, 0, NULL,
|
|
|
|
|
- build_address, NULL, NULL, addr_book_compose, "To AddrBk",
|
|
|
|
|
+ build_address, NULL, NULL, addr_book_compose, "<22>a<EFBFBD>}ï",
|
|
|
|
|
0, 1, 0, 1, 0, 1, 0, 0, 0, 0, KS_TOADDRBOOK},
|
|
|
|
|
{"To : ", "To", h_composer_to, 10, 0, NULL,
|
|
|
|
|
- build_address, NULL, NULL, addr_book_compose, "To AddrBk",
|
|
|
|
|
+ build_address, NULL, NULL, addr_book_compose, "<22>a<EFBFBD>}ï",
|
|
|
|
|
0, 1, 0, 0, 0, 1, 0, 0, 0, 0, KS_TOADDRBOOK},
|
|
|
|
|
{"Cc : ", "Cc", h_composer_cc, 10, 0, NULL,
|
|
|
|
|
- build_address, NULL, NULL, addr_book_compose, "To AddrBk",
|
|
|
|
|
+ build_address, NULL, NULL, addr_book_compose, "<22>a<EFBFBD>}ï",
|
|
|
|
|
0, 1, 0, 0, 0, 1, 0, 0, 0, 0, KS_TOADDRBOOK},
|
|
|
|
|
{"Bcc : ", "Bcc", h_composer_bcc, 10, 0, NULL,
|
|
|
|
|
- build_address, NULL, NULL, addr_book_compose, "To AddrBk",
|
|
|
|
|
+ build_address, NULL, NULL, addr_book_compose, "<22>a<EFBFBD>}ï",
|
|
|
|
|
0, 1, 0, 1, 0, 1, 0, 0, 0, 0, KS_TOADDRBOOK},
|
|
|
|
|
{"Newsgrps: ", "Newsgroups", h_composer_news, 10, 0, NULL,
|
|
|
|
|
- news_build, NULL, NULL, news_group_selector, "To NwsGrps",
|
|
|
|
|
+ news_build, NULL, NULL, news_group_selector, "<22>s<EFBFBD>D<EFBFBD>ոs<D5B8>C<EFBFBD><43>",
|
|
|
|
|
0, 1, 0, 1, 0, 1, 0, 0, 0, 0, KS_NONE},
|
|
|
|
|
{"Fcc : ", "Fcc", h_composer_fcc, 10, 0, NULL,
|
|
|
|
|
- NULL, NULL, NULL, folders_for_fcc, "To Fldrs",
|
|
|
|
|
+ NULL, NULL, NULL, folders_for_fcc, "<22><><EFBFBD>ƧX<C6A7>C<EFBFBD><43>",
|
|
|
|
|
0, 0, 0, 1, 1, 1, 0, 0, 0, 0, KS_NONE},
|
|
|
|
|
{"Lcc : ", "Lcc", h_composer_lcc, 10, 0, NULL,
|
|
|
|
|
- build_addr_lcc, NULL, NULL, addr_book_compose_lcc,"To AddrBk",
|
|
|
|
|
+ build_addr_lcc, NULL, NULL, addr_book_compose_lcc,"<22>a<EFBFBD>}ï",
|
|
|
|
|
0, 1, 0, 1, 0, 1, 0, 0, 0, 0, KS_NONE},
|
|
|
|
|
{"Attchmnt: ", "Attchmnt", h_composer_attachment, 10, 0, NULL,
|
|
|
|
|
- NULL, NULL, NULL, NULL, "To Files",
|
|
|
|
|
+ NULL, NULL, NULL, NULL, "<22>ɮצC<D7A6><43>",
|
|
|
|
|
0, 1, 1, 0, 0, 1, 0, 0, 0, 0, KS_NONE},
|
|
|
|
|
{"Subject : ", "Subject", h_composer_subject, 10, 0, NULL,
|
|
|
|
|
valid_subject, NULL, NULL, NULL, NULL,
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -1573,7 +1573,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|
|
|
|
|
static struct headerentry he_custom_addr_templ={
|
|
|
|
|
NULL, NULL, h_composer_custom_addr,10, 0, NULL,
|
|
|
|
|
- build_address, NULL, NULL, addr_book_compose, "To AddrBk",
|
|
|
|
|
+ build_address, NULL, NULL, addr_book_compose, "<22>a<EFBFBD>}ï",
|
|
|
|
|
0, 1, 0, 1, 0, 1, 0, 0, 0, 0, KS_TOADDRBOOK};
|
|
|
|
|
static struct headerentry he_custom_free_templ={
|
|
|
|
|
NULL, NULL, h_composer_custom_free,10, 0, NULL,
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -1856,7 +1856,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
q_status_message1(SM_ORDER,3,3,
|
|
|
|
|
- "Unknown header type %d in pine_simple_send", (void *)pf->type);
|
|
|
|
|
+ "<22>b pine_simple_send <20><><EFBFBD>X<EFBFBD>{<7B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Y<EFBFBD>κA %d", (void *)pf->type);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -1866,7 +1866,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
ekey[0].ch = ctrl('T');
|
|
|
|
|
ekey[0].rval = 2;
|
|
|
|
|
ekey[0].name = "^T";
|
|
|
|
|
- ekey[0].label = "To AddrBk";
|
|
|
|
|
+ ekey[0].label = "<22>a<EFBFBD>}ï";
|
|
|
|
|
ekey[1].ch = -1;
|
|
|
|
|
|
|
|
|
|
/*----------------------------------------------------------------------
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -1977,12 +1977,12 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
opts[i].ch = 'y';
|
|
|
|
|
opts[i].rval = 'y';
|
|
|
|
|
opts[i].name = "Y";
|
|
|
|
|
- opts[i++].label = "Yes";
|
|
|
|
|
+ opts[i++].label = "<22>O";
|
|
|
|
|
|
|
|
|
|
opts[i].ch = 'n';
|
|
|
|
|
opts[i].rval = 'n';
|
|
|
|
|
opts[i].name = "N";
|
|
|
|
|
- opts[i++].label = "No";
|
|
|
|
|
+ opts[i++].label = "<22>_";
|
|
|
|
|
|
|
|
|
|
verbose_requested = 0;
|
|
|
|
|
if(F_ON(F_VERBOSE_POST, ps_global)){
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -2029,7 +2029,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
dsn_show = (dsn_requested & DSN_SHOW);
|
|
|
|
|
sprintf(tmp_20k_buf,
|
|
|
|
|
"%s%s%s%s%s%sto \"%s\" ? ",
|
|
|
|
|
- prmpt_cnf ? prmpt_cnf : "Send message ",
|
|
|
|
|
+ prmpt_cnf ? prmpt_cnf : "<22>e<EFBFBD>H ",
|
|
|
|
|
(verbose_requested || dsn_show)
|
|
|
|
|
? "(" : "",
|
|
|
|
|
(verbose_requested)
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -2166,7 +2166,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
if(!(outgoing->to || outgoing->cc || outgoing->bcc
|
|
|
|
|
|| local_so)){
|
|
|
|
|
q_status_message(SM_ORDER, 3, 5,
|
|
|
|
|
- "No recipients specified!");
|
|
|
|
|
+ "<22>|<7C><><EFBFBD><EFBFBD><EFBFBD>w<EFBFBD><77><EFBFBD><EFBFBD><EFBFBD>H<EFBFBD>I");
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -2191,7 +2191,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
}
|
|
|
|
|
else if(result == 0){
|
|
|
|
|
q_status_message(SM_ORDER,3,5,
|
|
|
|
|
- "Fcc Failed!. No message saved.");
|
|
|
|
|
+ "Fcc <20><><EFBFBD>ѡI<D1A1><49><EFBFBD>s<EFBFBD>J<EFBFBD><4A><EFBFBD><EFBFBD><EFBFBD>H<EFBFBD><48><EFBFBD>C");
|
|
|
|
|
retval = -1;
|
|
|
|
|
dprint(1,
|
|
|
|
|
(debugfile, "explicit fcc write failed!\n"));
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -2209,7 +2209,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
- q_status_message(SM_ORDER, 0, 3, "Send cancelled");
|
|
|
|
|
+ q_status_message(SM_ORDER, 0, 3, "<22><><EFBFBD><EFBFBD><EFBFBD>H<EFBFBD><48>");
|
|
|
|
|
retval = -1;
|
|
|
|
|
}
|
|
|
|
|
}
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -2237,7 +2237,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 1:
|
|
|
|
|
- q_status_message(SM_ORDER, 0, 3, "Send cancelled");
|
|
|
|
|
+ q_status_message(SM_ORDER, 0, 3, "<22><><EFBFBD><EFBFBD><EFBFBD>H<EFBFBD><48>");
|
|
|
|
|
done++;
|
|
|
|
|
retval = -1;
|
|
|
|
|
break;
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -2488,7 +2488,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'x': /* ^C */
|
|
|
|
|
- q_status_message(SM_ORDER, 0, 3, "Message cancelled");
|
|
|
|
|
+ q_status_message(SM_ORDER, 0, 3, "<22><><EFBFBD><EFBFBD><EFBFBD>H<EFBFBD><48>");
|
|
|
|
|
dprint(4, (debugfile, "=== send: cancelled\n"));
|
1998-10-10 04:29:27 +00:00
|
|
|
|
pbuf = save_previous_pbuf;
|
1998-08-09 00:51:28 +00:00
|
|
|
|
return;
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -2879,7 +2879,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
q_status_message1(SM_ORDER,3,7,
|
|
|
|
|
- "Unknown header type %d in pine_send",
|
|
|
|
|
+ "<22>b pine_send <20><><EFBFBD>X<EFBFBD>{<7B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Y<EFBFBD>κA %d",
|
|
|
|
|
(void *)pf->type);
|
|
|
|
|
break;
|
|
|
|
|
}
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -2906,7 +2906,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
#endif
|
|
|
|
|
if(pf->canedit || !he->rich_header)
|
|
|
|
|
q_status_message(SM_ORDER, 3, 3,
|
|
|
|
|
- "Not allowed to change header \"From\"");
|
|
|
|
|
+ "<22><><EFBFBD><EFBFBD><EFBFBD>\\<5C><><EFBFBD>ܼ<EFBFBD><DCBC>Y \"From\"");
|
|
|
|
|
|
|
|
|
|
memset(he, 0, (size_t)sizeof(*he));
|
|
|
|
|
pf->he = NULL;
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -3254,7 +3254,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
? "CANCEL" : "HUH?"));
|
|
|
|
|
if((editor_result & COMP_CANCEL)
|
|
|
|
|
&& F_ON(F_QUELL_DEAD_LETTER, ps_global)){
|
|
|
|
|
- q_status_message(SM_ORDER, 0, 3, "Message cancelled");
|
|
|
|
|
+ q_status_message(SM_ORDER, 0, 3, "<22><><EFBFBD><EFBFBD><EFBFBD>H<EFBFBD><48>");
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -3278,7 +3278,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
&& (check_addresses(&header) == CA_BAD)){
|
|
|
|
|
/*--- Addresses didn't check out---*/
|
|
|
|
|
q_status_message(SM_ORDER, 7, 7,
|
|
|
|
|
- "Not allowed to postpone message until addresses are qualified");
|
|
|
|
|
+ "<22><><EFBFBD><EFBFBD><EFBFBD>a<EFBFBD>}<7D>X<EFBFBD>椧<EFBFBD>e<EFBFBD><65><EFBFBD><EFBFBD><EFBFBD>\\<5C>Ƚw<C8BD>H<EFBFBD><48>");
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -3336,7 +3336,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
if(!so_puts(local_so, tmp_20k_buf)){
|
1998-10-10 04:29:27 +00:00
|
|
|
|
if(editor_result & COMP_CANCEL)
|
|
|
|
|
q_status_message2(SM_ORDER | SM_DING, 3, 3,
|
|
|
|
|
- "Can't write \"%s\": %s",
|
|
|
|
|
+ "<22>L<EFBFBD>k<EFBFBD>g<EFBFBD>J \"%s\": %s",
|
|
|
|
|
folder, error_description(errno));
|
|
|
|
|
else
|
|
|
|
|
dprint(1, (debugfile, "* * * CAN'T WRITE %s: %s\n",
|
|
|
|
|
@@ -3349,7 +3349,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
if(!ps_global->VAR_POSTPONED_FOLDER
|
|
|
|
|
|| !ps_global->VAR_POSTPONED_FOLDER[0]){
|
|
|
|
|
q_status_message(SM_ORDER | SM_DING, 3, 3,
|
|
|
|
|
- "No postponed file defined");
|
|
|
|
|
+ "<22>S<EFBFBD><53><EFBFBD>w<EFBFBD>w<EFBFBD>q<EFBFBD><71><EFBFBD>Ƚw<C8BD><77>");
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -3379,7 +3379,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
strcpy(folder, ps_global->VAR_POSTPONED_FOLDER);
|
|
|
|
|
- strcpy(label, "postponed message");
|
|
|
|
|
+ strcpy(label, "<22>Ƚw<C8BD>H<EFBFBD><48>");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
local_so = open_fcc(folder,&fcc_cntxt, 1, NULL, NULL);
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -3521,10 +3521,10 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
&& ps_global->VAR_FORM_FOLDER[0]
|
|
|
|
|
&& !strcmp(folder, ps_global->VAR_FORM_FOLDER))
|
|
|
|
|
q_status_message(SM_ORDER, 0, 3,
|
|
|
|
|
- "Composition saved to Form Letter Folder. Select Compose to send.");
|
|
|
|
|
+ "<22>峹<EFBFBD>w<EFBFBD>Q<EFBFBD>s<EFBFBD>ܨӷ<DCA8><D3B7>H<EFBFBD><48><EFBFBD>X<EFBFBD>C<EFBFBD><43><EFBFBD>ܡu<DCA1>s<EFBFBD><73><EFBFBD>v<EFBFBD>e<EFBFBD>X<EFBFBD>C");
|
|
|
|
|
else
|
|
|
|
|
q_status_message(SM_ORDER, 0, 3,
|
|
|
|
|
- "Composition postponed. Select Compose to resume.");
|
|
|
|
|
+ "<22>峹<EFBFBD>w<EFBFBD>Ƚw<C8BD>H<EFBFBD>X<EFBFBD>C<EFBFBD><43><EFBFBD>ܡu<DCA1>s<EFBFBD><73><EFBFBD>v<EFBFBD>~<7E><><EFBFBD>s<EFBFBD>סC");
|
|
|
|
|
|
|
|
|
|
break; /* postpone went OK, get out of here */
|
|
|
|
|
}
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -3534,15 +3534,15 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
if(fcc_result && folder)
|
|
|
|
|
lc = last_cmpnt(folder);
|
|
|
|
|
|
|
|
|
|
- q_status_message3(SM_ORDER, 0, 3, "Message cancelled%s%s%s",
|
|
|
|
|
- (lc && *lc) ? " and copied to \"" : "",
|
|
|
|
|
+ q_status_message3(SM_ORDER, 0, 3, "<22><><EFBFBD><EFBFBD><EFBFBD>H<EFBFBD><48>%s%s%s",
|
|
|
|
|
+ (lc && *lc) ? " <20>ýƻs<C6BB><73> \"" : "",
|
|
|
|
|
(lc && *lc) ? lc : "",
|
|
|
|
|
(lc && *lc) ? "\" file" : "");
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
q_status_message(SM_ORDER, 0, 4,
|
|
|
|
|
- "Continuing composition. Message not postponed or sent");
|
|
|
|
|
+ "<22>~<7E><><EFBFBD>s<EFBFBD><73><EFBFBD>C<EFBFBD>H<EFBFBD>Q<F3A5BCB3>Ƚw<C8BD>ΰe<CEB0>X");
|
|
|
|
|
body_start = 1;
|
|
|
|
|
continue; /* postpone failed, jump back in to composer */
|
|
|
|
|
}
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -3558,14 +3558,14 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
/* --- If posting, confirm with user ----*/
|
|
|
|
|
if(outgoing->newsgroups && *outgoing->newsgroups
|
|
|
|
|
&& want_to(POST_PMT, 'n', 'n', NO_HELP, WT_NORM) == 'n'){
|
|
|
|
|
- q_status_message(SM_ORDER, 0, 3, "Message not posted");
|
|
|
|
|
+ q_status_message(SM_ORDER, 0, 3, "<22>峹<EFBFBD><E5B3B9><EFBFBD>Q<EFBFBD>Z<EFBFBD>n");
|
|
|
|
|
dprint(4, (debugfile, "no post, continuing\n"));
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(!(outgoing->to || outgoing->cc || outgoing->bcc || lcc_addr
|
|
|
|
|
|| outgoing->newsgroups || (fcc && fcc[0]))){
|
|
|
|
|
- q_status_message(SM_ORDER, 3, 4, "No recipients specified!");
|
|
|
|
|
+ q_status_message(SM_ORDER, 3, 4, "<22>|<7C><><EFBFBD><EFBFBD><EFBFBD>w<EFBFBD><77><EFBFBD><EFBFBD><EFBFBD>̡I");
|
|
|
|
|
dprint(4, (debugfile, "no recip, continuing\n"));
|
|
|
|
|
continue;
|
|
|
|
|
}
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -3607,8 +3607,8 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
&& !filter_message_text(sending_filter_requested, outgoing,
|
|
|
|
|
*body, &orig_so)){
|
|
|
|
|
q_status_message1(SM_ORDER, 3, 3,
|
|
|
|
|
- "Problem filtering! Nothing sent%s.",
|
|
|
|
|
- fcc ? " or saved to fcc" : "");
|
|
|
|
|
+ "<22>L<EFBFBD>o<EFBFBD><6F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>D<EFBFBD>I<EFBFBD>S<EFBFBD><53><EFBFBD>F<EFBFBD><46><EFBFBD>Q<EFBFBD>e<EFBFBD>X%s<>C",
|
|
|
|
|
+ fcc ? "<22>Φs<CEA6><73> fcc" : "");
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -3699,7 +3699,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
}
|
|
|
|
|
else if(!(result & (P_MAIL_BITS | P_NEWS_BITS))){
|
|
|
|
|
q_status_message(SM_ORDER, 3, 5,
|
|
|
|
|
- "Fcc Failed!. No message saved.");
|
|
|
|
|
+ "Fcc <20><><EFBFBD>ѡI<D1A1><49><EFBFBD>s<EFBFBD>J<EFBFBD><4A><EFBFBD><EFBFBD><EFBFBD>H<EFBFBD><48><EFBFBD>C");
|
|
|
|
|
dprint(1, (debugfile,
|
|
|
|
|
"explicit fcc write failed!\n"));
|
|
|
|
|
result |= P_FCC_LOSE;
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -3766,7 +3766,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
}
|
|
|
|
|
else if(!(result & (P_MAIL_BITS | P_NEWS_BITS))){
|
|
|
|
|
q_status_message(SM_ORDER,3,5,
|
|
|
|
|
- "Fcc Failed!. No message saved.");
|
|
|
|
|
+ "Fcc <20><><EFBFBD>ѡI<D1A1><49><EFBFBD>s<EFBFBD>J<EFBFBD><4A><EFBFBD><EFBFBD><EFBFBD>H<EFBFBD><48><EFBFBD>C");
|
|
|
|
|
dprint(1, (debugfile, "explicit fcc write failed!\n"));
|
|
|
|
|
result |= P_FCC_LOSE;
|
|
|
|
|
}
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -3852,8 +3852,8 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
postpone_prompt()
|
|
|
|
|
{
|
|
|
|
|
int ret = 1;
|
|
|
|
|
- static ESCKEY_S pstpn_form_opt[] = { {'p', 'p', "P", "Postponed Folder"},
|
|
|
|
|
- {'f', 'f', "F", "Form Letter Folder"},
|
|
|
|
|
+ static ESCKEY_S pstpn_form_opt[] = { {'p', 'p', "P", "<22>Ƚw<C8BD>ɮקX"},
|
|
|
|
|
+ {'f', 'f', "F", "<22>ӷ<EFBFBD><D3B7>H<EFBFBD><48><EFBFBD>X"},
|
|
|
|
|
{-1, 0, NULL, NULL} };
|
|
|
|
|
|
|
|
|
|
return(radio_buttons(PSTPN_FORM_PMT, -FOOTER_ROWS(ps_global),
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -4005,23 +4005,23 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
char *buf;
|
|
|
|
|
int *goodorbad;
|
|
|
|
|
{
|
|
|
|
|
- sprintf(buf, "Message %s%s%s%s%s%s%s.",
|
|
|
|
|
+ sprintf(buf, "<22>H<EFBFBD><48> %s%s%s%s%s%s%s.",
|
|
|
|
|
(result & P_NEWS_WIN)
|
|
|
|
|
- ? "posted"
|
|
|
|
|
+ ? "<22>w<EFBFBD>Z<EFBFBD>n"
|
|
|
|
|
: (result & P_NEWS_LOSE)
|
|
|
|
|
- ? "NOT posted" : "",
|
|
|
|
|
+ ? "<22><><EFBFBD>Q<EFBFBD>Z<EFBFBD>n" : "",
|
|
|
|
|
((result & P_NEWS_BITS) && (result & P_MAIL_BITS)
|
|
|
|
|
&& (result & P_FCC_BITS))
|
|
|
|
|
? ", "
|
|
|
|
|
: ((result & P_NEWS_BITS) && (result & P_MAIL_BITS))
|
|
|
|
|
- ? " and " : "",
|
|
|
|
|
+ ? " <20><> " : "",
|
|
|
|
|
(result & P_MAIL_WIN)
|
|
|
|
|
- ? "sent"
|
|
|
|
|
+ ? "<22>w<EFBFBD>H<EFBFBD>X"
|
|
|
|
|
: (result & P_MAIL_LOSE)
|
|
|
|
|
- ? "NOT SENT" : "",
|
|
|
|
|
+ ? "<22><><EFBFBD>H<EFBFBD>X" : "",
|
|
|
|
|
((result & (P_MAIL_BITS | P_NEWS_BITS)) && (result & P_FCC_BITS))
|
|
|
|
|
- ? " and copied to "
|
|
|
|
|
- : (result & P_FCC_WIN) ? "ONLY copied to " : "",
|
|
|
|
|
+ ? " <20>óQ<C3B3>ƻs<C6BB><73> "
|
|
|
|
|
+ : (result & P_FCC_WIN) ? "<22>ȳQ<C8B3>ƻs<C6BB><73> " : "",
|
|
|
|
|
(result & P_FCC_WIN) ? "\"" : "",
|
|
|
|
|
(result & P_FCC_WIN) ? fcc_name : "",
|
|
|
|
|
(result & P_FCC_WIN) ? "\"" : "");
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -4060,7 +4060,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|| (F_ON(F_COMPOSE_REJECTS_UNQUAL, ps_global)
|
|
|
|
|
&& a->host[0] == '@'))){
|
|
|
|
|
q_status_message2(SM_ORDER, 4, 7,
|
|
|
|
|
- "Can't send to address %s: %s",
|
|
|
|
|
+ "<22>L<EFBFBD>k<EFBFBD>H<EFBFBD><48> %s<>G%s",
|
|
|
|
|
a->mailbox,
|
|
|
|
|
(a->host[0] == '.')
|
|
|
|
|
? a->host
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -4070,7 +4070,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
else if(ps_global->restricted
|
|
|
|
|
&& !address_is_us(*pf->addr, ps_global)){
|
|
|
|
|
q_status_message(SM_ORDER, 3, 3,
|
|
|
|
|
- "Restricted demo version of Pine. You may only send mail to yourself");
|
|
|
|
|
+ "<22>o<EFBFBD>O Pine <20><><EFBFBD>i<EFBFBD>ܪ<EFBFBD><DCAA>C<EFBFBD>ȯ<EFBFBD><C8AF>H<EFBFBD>H<EFBFBD><48><EFBFBD>ۤv");
|
|
|
|
|
return(CA_BAD);
|
|
|
|
|
}
|
|
|
|
|
else if(a->mailbox && strucmp(a->mailbox, "mailer-daemon") == 0
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -4220,7 +4220,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
if(!(n > 0L && n <= mn_get_total(ps_global->msgmap)
|
|
|
|
|
&& (e = mail_fetchstructure(ps_global->mail_stream,
|
|
|
|
|
mn_m2raw(ps_global->msgmap, n), &b)))){
|
|
|
|
|
- q_status_message(SM_ORDER|SM_DING,3,3,"Error inserting Message");
|
|
|
|
|
+ q_status_message(SM_ORDER|SM_DING,3,3,"<22><><EFBFBD>J<EFBFBD>H<EFBFBD><48><EFBFBD>ɵo<C9B5>Ϳ<EFBFBD><CDBF>~");
|
|
|
|
|
flush_status_messages(0);
|
|
|
|
|
return(0L);
|
|
|
|
|
}
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -4235,7 +4235,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
/* actually write message text */
|
|
|
|
|
if(!format_message(mn_m2raw(ps_global->msgmap, n), e, b,
|
|
|
|
|
FM_NEW_MESS | FM_DISPLAY, f)){
|
|
|
|
|
- q_status_message(SM_ORDER|SM_DING,3,3,"Error inserting Message");
|
|
|
|
|
+ q_status_message(SM_ORDER|SM_DING,3,3,"<22><><EFBFBD>J<EFBFBD>H<EFBFBD><48><EFBFBD>ɵo<C9B5>Ϳ<EFBFBD><CDBF>~");
|
|
|
|
|
flush_status_messages(0);
|
|
|
|
|
rv = 0L;
|
|
|
|
|
}
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -4348,12 +4348,12 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
opts[i].ch = 'y';
|
|
|
|
|
opts[i].rval = 'y';
|
|
|
|
|
opts[i].name = "Y";
|
|
|
|
|
- opts[i++].label = "Yes";
|
|
|
|
|
+ opts[i++].label = "<22>O";
|
|
|
|
|
|
|
|
|
|
opts[i].ch = 'n';
|
|
|
|
|
opts[i].rval = 'n';
|
|
|
|
|
opts[i].name = "N";
|
|
|
|
|
- opts[i++].label = "No";
|
|
|
|
|
+ opts[i++].label = "<22>_";
|
|
|
|
|
|
|
|
|
|
if(filters){
|
|
|
|
|
/* set global_filter_pointer to desired filter or NULL if none */
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -4361,12 +4361,12 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
opts[i].ch = ctrl('P');
|
|
|
|
|
opts[i].rval = 10;
|
|
|
|
|
opts[i].name = "^P";
|
|
|
|
|
- opts[i++].label = "Prev Filter";
|
|
|
|
|
+ opts[i++].label = "<22>e<EFBFBD>@<40>ӹL<D3B9>o<EFBFBD><6F>";
|
|
|
|
|
|
|
|
|
|
opts[i].ch = ctrl('N');
|
|
|
|
|
opts[i].rval = 11;
|
|
|
|
|
opts[i].name = "^N";
|
|
|
|
|
- opts[i++].label = "Next Filter";
|
|
|
|
|
+ opts[i++].label = "<22>U<EFBFBD>@<40>ӹL<D3B9>o<EFBFBD><6F>";
|
|
|
|
|
|
|
|
|
|
if(F_ON(F_FIRST_SEND_FILTER_DFLT, ps_global))
|
|
|
|
|
filters = filters->next;
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -4436,23 +4436,23 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
p = NULL;
|
|
|
|
|
|
|
|
|
|
dsn_show = (dsn_requested & DSN_SHOW);
|
|
|
|
|
- sprintf(tmp_20k_buf, "Send message%s%s%s%s%s%s%s%s%s%s%s%s? ",
|
|
|
|
|
+ sprintf(tmp_20k_buf, "<22>e<EFBFBD>X<EFBFBD>H<EFBFBD><48>%s%s%s%s%s%s%s%s%s%s%s%s? ",
|
|
|
|
|
(filters || verbose_requested || background_requested
|
|
|
|
|
|| dsn_show)
|
|
|
|
|
? " (" : "",
|
|
|
|
|
- (filters && filters->filter) ? "filtered thru \"" : "",
|
|
|
|
|
+ (filters && filters->filter) ? "<22>g<EFBFBD>ѹL<D1B9>o<EFBFBD><6F> \"" : "",
|
|
|
|
|
(filters)
|
|
|
|
|
? (filters->filter
|
|
|
|
|
? filters->filter
|
|
|
|
|
- : "unfiltered")
|
|
|
|
|
+ : "<22><><EFBFBD>g<EFBFBD>L<EFBFBD>o")
|
|
|
|
|
: "",
|
|
|
|
|
(filters && filters->filter) ? "\"" : "",
|
|
|
|
|
(filters && (verbose_requested || background_requested))
|
|
|
|
|
? " " : "",
|
|
|
|
|
(verbose_requested || background_requested)
|
|
|
|
|
? "in " : "",
|
|
|
|
|
- (verbose_requested) ? "verbose " : "",
|
|
|
|
|
- (background_requested) ? "background " : "",
|
|
|
|
|
+ (verbose_requested) ? "<22><><EFBFBD>ܲӸ` " : "",
|
|
|
|
|
+ (background_requested) ? "<22>I<EFBFBD><49><EFBFBD>e<EFBFBD>X " : "",
|
|
|
|
|
(verbose_requested || background_requested)
|
|
|
|
|
? "mode" : "",
|
|
|
|
|
(dsn_show
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -4467,11 +4467,11 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
*p = ' ';
|
|
|
|
|
|
|
|
|
|
if(verbose_label)
|
|
|
|
|
- opts[verbose_label].label = verbose_requested ? "Normal" : "Verbose";
|
|
|
|
|
+ opts[verbose_label].label = verbose_requested ? "<22>q<EFBFBD>`" : "<22><><EFBFBD>ܲӸ`";
|
|
|
|
|
|
|
|
|
|
if(bg_label)
|
|
|
|
|
opts[bg_label].label = background_requested
|
|
|
|
|
- ? "Foreground" : "Background";
|
|
|
|
|
+ ? "<22>e<EFBFBD><65>" : "<22>I<EFBFBD><49>";
|
|
|
|
|
|
|
|
|
|
if(F_ON(F_DSN, ps_global)){
|
|
|
|
|
if(dsn_requested & DSN_SHOW){
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -4495,11 +4495,11 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
else if(rv == 'n'){ /* Declined! */
|
|
|
|
|
- rstr = "No Message Sent";
|
|
|
|
|
+ rstr = "<22>S<EFBFBD><53><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>H<EFBFBD><48><EFBFBD>Q<EFBFBD>e<EFBFBD>X";
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
else if(rv == 'z'){ /* Cancelled! */
|
|
|
|
|
- rstr = "Send Cancelled";
|
|
|
|
|
+ rstr = "<22><><EFBFBD><EFBFBD><EFBFBD>e<EFBFBD><65>";
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
else if(rv == 10) /* PREVIOUS filter */
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -4681,7 +4681,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
if(body->type != TYPEOTHER){
|
|
|
|
|
rv = 1;
|
|
|
|
|
q_status_message3(SM_ORDER, 0, 3,
|
|
|
|
|
- "File %s attached as type %s/%s", file,
|
|
|
|
|
+ "<22>ɮ<EFBFBD> %s <20><><EFBFBD>[<5B><> %s/%s", file,
|
|
|
|
|
body_types[body->type],
|
|
|
|
|
body->subtype ? body->subtype : rfc822_default_subtype(body->type));
|
|
|
|
|
}
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -4730,7 +4730,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
(void) close_system_pipe(&syspipe);
|
|
|
|
|
if((l = name_file_size(fname)) < 0L){
|
|
|
|
|
q_status_message2(SM_ORDER | SM_DING, 3, 4,
|
|
|
|
|
- "Error determining size of %s: %s", fname,
|
|
|
|
|
+ "<22>M<EFBFBD>w<EFBFBD>ɮ<EFBFBD> %s <20>j<EFBFBD>p<EFBFBD>ɵo<C9B5>Ϳ<EFBFBD><CDBF>~<7E>G%s", fname,
|
|
|
|
|
fnp = error_description(errno));
|
|
|
|
|
dprint(1, (debugfile,
|
|
|
|
|
"!!! Upload cmd \"%s\" failed for \"%s\": %s\n",
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -4742,7 +4742,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
return(l >= 0);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
- q_status_message(SM_ORDER | SM_DING, 3, 4, "Error opening pipe");
|
|
|
|
|
+ q_status_message(SM_ORDER | SM_DING, 3, 4, "<22>}<7D>Һu<DEBD>ɵo<C9B5>Ϳ<EFBFBD><CDBF>~");
|
|
|
|
|
|
|
|
|
|
return(0);
|
|
|
|
|
}
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -4795,7 +4795,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
else if(reply->flags == REPLY_MSGNO)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
- we_cancel = busy_alarm(1, "Updating \"Answered\" Flags", NULL, 1);
|
|
|
|
|
+ we_cancel = busy_alarm(1, "<22><><EFBFBD>b<EFBFBD><62><EFBFBD>s \"<22>w<EFBFBD>^<5E><>\" <20>X<EFBFBD><58>", NULL, 1);
|
|
|
|
|
if(!stream){
|
|
|
|
|
if(stream = mail_open(NULL, reply->mailbox, OP_SILENT)){
|
|
|
|
|
ourstream++;
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -4873,7 +4873,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
so_give(&tmpf_so);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
- errstr = "Can't create space for filter temporary file.";
|
|
|
|
|
+ errstr = "<22>L<EFBFBD>k<EFBFBD>إ߹L<DFB9>o<EFBFBD><6F><EFBFBD><EFBFBD><EFBFBD>Ȧs<C8A6>ɡC";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(!errstr){
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -4897,13 +4897,13 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
so_give(&tmpf_so);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
- errstr = "Can't open temp file filter wrote.";
|
|
|
|
|
+ errstr = "<22>L<EFBFBD>k<EFBFBD>}<7D>ҹL<D2B9>o<EFBFBD><6F><EFBFBD><EFBFBD><EFBFBD>Ȧs<C8A6>ɡC";
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
- errstr = "Filter command returned error.";
|
|
|
|
|
+ errstr = "<22>L<EFBFBD>o<EFBFBD><6F><EFBFBD><EFBFBD><EFBFBD>O<EFBFBD>Ǧ^<5E><><EFBFBD>~<7E>ȡC";
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
- errstr = "Can't exec filter text.";
|
|
|
|
|
+ errstr = "<22>L<EFBFBD>k<EFBFBD><6B><EFBFBD><EFBFBD><EFBFBD>L<EFBFBD>o<EFBFBD><6F><EFBFBD>C";
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
errstr = gf_filter(cmd, key ? filter_session_key() : NULL,
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -4914,7 +4914,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
if(errstr){
|
|
|
|
|
int ch;
|
|
|
|
|
|
|
|
|
|
- fprintf(stdout, "\r\n%s Hit return to continue.", errstr);
|
|
|
|
|
+ fprintf(stdout, "\r\n%s <20><><EFBFBD>J return <20>~<7E><><EFBFBD>C", errstr);
|
|
|
|
|
fflush(stdout);
|
|
|
|
|
while((ch = read_char(300)) != ctrl('M')
|
|
|
|
|
&& ch != NO_OP_IDLE)
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -5007,7 +5007,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
if(tmp_so)
|
|
|
|
|
so_give(&tmp_so);
|
|
|
|
|
|
|
|
|
|
- q_status_message1(SM_ORDER | SM_DING, 3, 6, "Problem filtering: %s",
|
|
|
|
|
+ q_status_message1(SM_ORDER | SM_DING, 3, 6, "<22>L<EFBFBD>o<EFBFBD>L<EFBFBD>{<7B><><EFBFBD><EFBFBD><EFBFBD>D<EFBFBD>G%s",
|
|
|
|
|
errstr);
|
|
|
|
|
dprint(1, (debugfile, "Filter FAILED: %s\n", errstr));
|
|
|
|
|
}
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -5092,11 +5092,11 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|
|
|
|
|
loser = pine_simple_send(outgoing, &body, NULL, NULL, NULL, 0);
|
|
|
|
|
|
|
|
|
|
- q_status_message(SM_ORDER, 0, 3, "Thanks for being counted!");
|
|
|
|
|
+ q_status_message(SM_ORDER, 0, 3, "<22>P<EFBFBD>±z<C2B1>@<40>N<EFBFBD>Q<EFBFBD>p<EFBFBD>⬰ Pine <20><><EFBFBD>ϥΪ̡I");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
q_status_message(SM_ORDER | SM_DING, 3, 4,
|
|
|
|
|
- "Problem creating space for message text.");
|
|
|
|
|
+ "<22>إ߰T<DFB0><54><EFBFBD><EFBFBD><EFBFBD>r<EFBFBD>Ŷ<EFBFBD><C5B6>ɵo<C9B5>Ϳ<EFBFBD><CDBF>~<7E>C");
|
|
|
|
|
|
|
|
|
|
mail_free_envelope(&outgoing);
|
|
|
|
|
pine_free_body(&body);
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -5180,7 +5180,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|
|
|
|
|
if(!pf){
|
|
|
|
|
q_status_message(SM_ORDER,3,3,
|
|
|
|
|
- "Can't send message. No recipients specified!");
|
|
|
|
|
+ "<22>L<EFBFBD>k<EFBFBD>e<EFBFBD>H<EFBFBD>C<EFBFBD>|<7C><><EFBFBD><EFBFBD><EFBFBD>w<EFBFBD><77><EFBFBD>H<EFBFBD>H<EFBFBD>I");
|
|
|
|
|
return(0);
|
|
|
|
|
}
|
|
|
|
|
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -5189,7 +5189,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
gf_filter_init(); /* zero piped byte count, 'n */
|
|
|
|
|
send_bytes_to_send = send_body_size(body); /* count body bytes */
|
|
|
|
|
ps_global->c_client_error[0] = error_buf[0] = '\0';
|
|
|
|
|
- we_cancel = busy_alarm(1, "Sending mail",
|
|
|
|
|
+ we_cancel = busy_alarm(1, "<22><><EFBFBD>b<EFBFBD>H<EFBFBD>H",
|
|
|
|
|
send_bytes_to_send ? sent_percent : NULL, 1);
|
|
|
|
|
|
|
|
|
|
/* try posting via local "<mta> <-t>" if specified */
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -5374,7 +5374,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
struct headerentry *last_he = NULL;
|
|
|
|
|
|
|
|
|
|
sprintf(error_buf,
|
|
|
|
|
- "Mail not sent. Sending error%s%.40s",
|
|
|
|
|
+ "<22>H<EFBFBD>Q<F3A5BCB3>H<EFBFBD>X<EFBFBD>C<EFBFBD>H<EFBFBD><48><EFBFBD><EFBFBD><EFBFBD>~%s%.40s",
|
|
|
|
|
(sending_stream && sending_stream->reply) ? ": ": ".",
|
|
|
|
|
(sending_stream && sending_stream->reply)
|
|
|
|
|
? sending_stream->reply : "");
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -5447,7 +5447,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
TIME_STAMP("smtp done", 1);
|
|
|
|
|
}
|
|
|
|
|
else if(!error_mess)
|
|
|
|
|
- sprintf(error_mess = error_buf, "Error sending: %.60s",
|
|
|
|
|
+ sprintf(error_mess = error_buf, "<22>H<EFBFBD>H<EFBFBD>ɵo<C9B5>Ϳ<EFBFBD><CDBF>~<7E>G%.60s",
|
|
|
|
|
ps_global->c_client_error);
|
|
|
|
|
|
|
|
|
|
if(verbose_file){
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -5455,7 +5455,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
TIME_STAMP("verbose start", 1);
|
|
|
|
|
fclose(verbose_send_output);
|
|
|
|
|
verbose_send_output = NULL;
|
|
|
|
|
- q_status_message(SM_ORDER, 0, 3, "Verbose SMTP output received");
|
|
|
|
|
+ q_status_message(SM_ORDER, 0, 3, "<22><><EFBFBD><EFBFBD><EFBFBD>ԲӪ<D4B2> SMTP <20><><EFBFBD>X<EFBFBD>T<EFBFBD><54>");
|
|
|
|
|
display_output_file(verbose_file, "Verbose SMTP Interaction",NULL, 1);
|
|
|
|
|
TIME_STAMP("verbose end", 1);
|
|
|
|
|
}
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -5544,12 +5544,12 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
if(folder_index(fcc, *fcc_cntxt, FI_FOLDER) < 0){
|
|
|
|
|
if(ps_global->context_list->next)
|
|
|
|
|
sprintf(tmp_20k_buf,
|
|
|
|
|
- "Folder \"%.20s\" in <%.30s> doesn't exist. Create",
|
|
|
|
|
+ "<22>H<EFBFBD><48><EFBFBD>X \"%.20s\" <20>b <%.30s> <20>|<7C><><EFBFBD>s<EFBFBD>b<EFBFBD>C<EFBFBD>n<EFBFBD>s<EFBFBD><73>",
|
|
|
|
|
strsquish(tmp_20k_buf + 500, fcc, 20),
|
|
|
|
|
strsquish(tmp_20k_buf + 1000,(*fcc_cntxt)->nickname,30));
|
|
|
|
|
else
|
|
|
|
|
sprintf(tmp_20k_buf,
|
|
|
|
|
- "Folder \"%s\" doesn't exist. Create",
|
|
|
|
|
+ "<22>H<EFBFBD><48><EFBFBD>X \"%s\" <20>|<7C><><EFBFBD>s<EFBFBD>b<EFBFBD>C<EFBFBD>n<EFBFBD>s<EFBFBD><73>",
|
|
|
|
|
strsquish(tmp_20k_buf + 500, fcc, 40));
|
|
|
|
|
|
|
|
|
|
if(force || want_to(tmp_20k_buf,'y','n',NO_HELP,WT_NORM) == 'y'){
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -5586,7 +5586,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
ok++;
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
- sprintf(tmp_20k_buf,"Folder \"%s\" doesn't exist. Create",
|
|
|
|
|
+ sprintf(tmp_20k_buf,"<22>H<EFBFBD><48><EFBFBD>X \"%s\" <20>|<7C><><EFBFBD>s<EFBFBD>b<EFBFBD>C<EFBFBD>n<EFBFBD>s<EFBFBD><73>",
|
|
|
|
|
strsquish(tmp_20k_buf + 500, fcc, 40));
|
|
|
|
|
if(force || want_to(tmp_20k_buf,'y','n',NO_HELP,WT_NORM) == 'y'){
|
|
|
|
|
/*
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -5620,8 +5620,8 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|
|
|
|
|
if(ok == 0){
|
|
|
|
|
if(ps_global->mm_log_error){
|
|
|
|
|
- s1 = err_prefix ? err_prefix : "Fcc Error: ";
|
|
|
|
|
- s2 = err_suffix ? err_suffix : " Message NOT sent or copied.";
|
|
|
|
|
+ s1 = err_prefix ? err_prefix : "Fcc <20><><EFBFBD>~<7E>G";
|
|
|
|
|
+ s2 = err_suffix ? err_suffix : " <20>H<EFBFBD><48><EFBFBD>S<EFBFBD><53><EFBFBD>Q<EFBFBD>H<EFBFBD>X<EFBFBD>νƻs<C6BB>C";
|
|
|
|
|
|
|
|
|
|
l1 = strlen(s1);
|
|
|
|
|
l2 = strlen(s2);
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -5639,10 +5639,10 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
- errstr = "Fcc creation error. Message NOT sent or copied.";
|
|
|
|
|
+ errstr = "<22>إ<EFBFBD> Fcc <20>ɵo<C9B5>Ϳ<EFBFBD><CDBF>~<7E>C<EFBFBD>H<EFBFBD><48><EFBFBD>S<EFBFBD><53><EFBFBD>Q<EFBFBD>e<EFBFBD>X<EFBFBD>νƻs<C6BB>C";
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
- errstr = "Fcc creation rejected. Message NOT sent or copied.";
|
|
|
|
|
+ errstr = "Fcc <20><><EFBFBD>إ߾D<DFBE>ڵ<EFBFBD><DAB5>C<EFBFBD>H<EFBFBD><48><EFBFBD>S<EFBFBD><53><EFBFBD>Q<EFBFBD>e<EFBFBD>X<EFBFBD>νƻs<C6BB>C";
|
|
|
|
|
|
|
|
|
|
q_status_message(SM_ORDER | SM_DING, 3, 3, errstr);
|
|
|
|
|
}
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -5690,7 +5690,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
if(label && *label){
|
|
|
|
|
char msg_buf[80];
|
|
|
|
|
|
|
|
|
|
- strncat(strcpy(msg_buf, "Writing "), label, 70);
|
|
|
|
|
+ strncat(strcpy(msg_buf, "<22><><EFBFBD>b<EFBFBD>g<EFBFBD>J "), label, 70);
|
|
|
|
|
we_cancel = busy_alarm(1, msg_buf, NULL, 1);
|
|
|
|
|
}
|
|
|
|
|
else
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -5726,7 +5726,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
we_cancel = 0;
|
|
|
|
|
|
|
|
|
|
q_status_message1(SM_ORDER | SM_DING, 3, 5,
|
|
|
|
|
- "Write to \"%s\" FAILED!!!", fcc);
|
|
|
|
|
+ "<22>g<EFBFBD>J \"%s\" <20><><EFBFBD>ѡI<D1A1>I<EFBFBD>I", fcc);
|
|
|
|
|
dprint(1, (debugfile, "ERROR appending %s in \"%s\"",
|
|
|
|
|
fcc, cntxt ? cntxt->context : "NULL"));
|
|
|
|
|
return(0);
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -6209,7 +6209,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
if((file_contents = (void *)so_get(FileStar, pa->filename,
|
|
|
|
|
READ_ACCESS)) == NULL){
|
|
|
|
|
q_status_message2(SM_ORDER | SM_DING, 3, 4,
|
|
|
|
|
- "Error \"%s\", couldn't attach file \"%s\"",
|
|
|
|
|
+ "<22><><EFBFBD>~ \"%s\"<22>A<EFBFBD>L<EFBFBD>k<EFBFBD><6B><EFBFBD>[<5B>ɮ<EFBFBD> \"%s\"",
|
|
|
|
|
error_description(errno), pa->filename);
|
|
|
|
|
display_message('x');
|
|
|
|
|
continue;
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -6736,13 +6736,17 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
body->subtype = cpystr("octet-stream");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- /*
|
|
|
|
|
- * Apply maximal encoding regardless of previous
|
|
|
|
|
- * setting. This segment's either not text, or is
|
|
|
|
|
- * unlikely to be readable with > 30% of the
|
|
|
|
|
- * text encoded anyway, so we might as well save space...
|
|
|
|
|
- */
|
|
|
|
|
- new_encoding = ENCBINARY; /* > 30% 8 bit chars */
|
|
|
|
|
+ if(body->type == TYPETEXT)
|
|
|
|
|
+ /* Use ENC8BIT rather than ENCBINARY for TEXT */
|
|
|
|
|
+ new_encoding = ENC8BIT;
|
|
|
|
|
+ else
|
|
|
|
|
+ /*
|
|
|
|
|
+ * Apply maximal encoding regardless of previous
|
|
|
|
|
+ * setting. This segment's either not text, or is
|
|
|
|
|
+ * unlikely to be readable with > 30% of the
|
|
|
|
|
+ * text encoded anyway, so we might as well save space...
|
|
|
|
|
+ */
|
|
|
|
|
+ new_encoding = ENCBINARY; /* > 30% 8 bit chars */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -6912,6 +6916,9 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
value = rfc1522_encode(tmp_20k_buf, (unsigned char *) text,
|
|
|
|
|
ps_global->VAR_CHAR_SET);
|
|
|
|
|
|
|
|
|
|
+ if (!strcmp(field, "Subject"))
|
|
|
|
|
+ value = text;
|
|
|
|
|
+
|
|
|
|
|
if(value && value == text){ /* no encoding was done, have to fold */
|
|
|
|
|
int fold_by, len;
|
|
|
|
|
char *actual_field;
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -7254,7 +7261,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
- q_status_message1(SM_ORDER,3,7,"Unknown header type: %s",pf->name);
|
|
|
|
|
+ q_status_message1(SM_ORDER,3,7,"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Y<EFBFBD>κA<CEBA>G%s",pf->name);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -7573,7 +7580,8 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|
|
|
|
|
switch (body->encoding) { /* all else needs filtering */
|
|
|
|
|
case ENC8BIT: /* encode 8BIT into QUOTED-PRINTABLE */
|
|
|
|
|
- gf_link_filter(gf_8bit_qp, NULL);
|
|
|
|
|
+ if(F_OFF(F_ENABLE_8BIT, ps_global)) /* unless 8BIT enabled */
|
|
|
|
|
+ gf_link_filter(gf_8bit_qp, NULL);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ENCBINARY: /* encode binary into BASE64 */
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -7587,7 +7595,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|
|
|
|
|
if(encode_error = gf_pipe(gc, l_putc)){ /* shove body part down pipe */
|
|
|
|
|
q_status_message1(SM_ORDER | SM_DING, 3, 4,
|
|
|
|
|
- "Encoding Error \"%s\"", encode_error);
|
|
|
|
|
+ "<22>s<EFBFBD>X<EFBFBD>ɵo<C9B5>Ϳ<EFBFBD><CDBF>~ \"%s\"", encode_error);
|
|
|
|
|
display_message('x');
|
|
|
|
|
}
|
|
|
|
|
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -7656,7 +7664,7 @@
|
1998-08-24 01:24:44 +00:00
|
|
|
|
&& !(so_puts(so, "Content-Transfer-Encoding: ")
|
|
|
|
|
&& so_puts(so, body_encodings[(body->encoding==ENCBINARY)
|
|
|
|
|
? ENCBASE64
|
|
|
|
|
- : (body->encoding == ENC8BIT)
|
|
|
|
|
+ : (body->encoding == ENC8BIT && F_OFF(F_ENABLE_8BIT, ps_global))
|
|
|
|
|
? ENCQUOTEDPRINTABLE
|
|
|
|
|
: (body->encoding <= ENCMAX)
|
|
|
|
|
? body->encoding
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -8279,7 +8287,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|| (forbid = pine_header_forbidden(name))){
|
|
|
|
|
if(forbid)
|
|
|
|
|
q_status_message1(SM_ORDER, 3, 3,
|
|
|
|
|
- "Not allowed to change header \"%s\"", name);
|
|
|
|
|
+ "<22><><EFBFBD><EFBFBD><EFBFBD>\\<5C><><EFBFBD>ܼ<EFBFBD><DCBC>Y \"%s\"", name);
|
|
|
|
|
|
|
|
|
|
*t = save;
|
|
|
|
|
continue;
|
1998-10-10 04:29:27 +00:00
|
|
|
|
@@ -8396,7 +8404,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
if(ps_global->post){
|
|
|
|
|
if(gripe)
|
|
|
|
|
q_status_message(SM_ORDER|SM_DING, 3, 3,
|
|
|
|
|
- "Can't post while posting!");
|
|
|
|
|
+ "<22>L<EFBFBD>k<EFBFBD>b<F3A5BFA6>Z<EFBFBD>n<EFBFBD>峹<EFBFBD>ɦA<C9A6>ץZ<D7A5>n<EFBFBD>I");
|
|
|
|
|
return(1);
|
|
|
|
|
}
|
|
|
|
|
|