head	1.8;
access;
symbols
	RELEASE_4_2_0:1.7
	RELEASE_4_1_1:1.7
	RELEASE_4_1_0:1.7
	RELEASE_3_5_0:1.7
	RELEASE_4_0_0:1.7
	RELEASE_3_4_0:1.6
	RELEASE_3_3_0:1.5
	RELEASE_3_2_0:1.5
	RELEASE_3_1_0:1.4
	RELEASE_2_2_8:1.4
	RELEASE_3_0_0:1.4
	RELEASE_2_2_6:1.1;
locks; strict;
comment	@# @;


1.8
date	2000.11.17.19.06.53;	author keith;	state dead;
branches;
next	1.7;

1.7
date	99.12.27.00.58.52;	author steve;	state Exp;
branches;
next	1.6;

1.6
date	99.11.01.00.40.57;	author steve;	state Exp;
branches;
next	1.5;

1.5
date	99.03.15.01.45.42;	author steve;	state Exp;
branches;
next	1.4;

1.4
date	98.08.09.00.51.26;	author steve;	state Exp;
branches;
next	1.3;

1.3
date	98.07.30.12.30.39;	author vanilla;	state Exp;
branches;
next	1.2;

1.2
date	98.07.21.14.11.41;	author vanilla;	state dead;
branches;
next	1.1;

1.1
date	98.02.02.14.34.42;	author vanilla;	state Exp;
branches;
next	;


desc
@@


1.8
log
@Upgrade from 4.21 to 4.30.

Especially thanks to the maintainer, Tai-hwa Liang (avatar), for
ending those long lasting evil +400k files/patch-*. :-)

According to kkenn, pine4's security will exist until it's totally
rewritten, so I'll leave pkg-install untouched, which shows the
security warning.
PR:		ports/22436
@
text
@--- pine/reply.c.orig	Tue Nov  9 02:24:35 1999
+++ pine/reply.c	Fri Nov 19 16:18:24 1999
@@@@ -110,9 +110,9 @@@@
 /*
  * Little defs to keep the code a bit neater...
  */
-#define	FRM_PMT	"Use \"Reply-To:\" address instead of \"From:\" address"
-#define	ALL_PMT		"Reply to all recipients"
-#define	NEWS_PMT	"Follow-up to news group(s), Reply via email to author or Both? "
+#define	FRM_PMT	"ϥ \"Reply-To:\" a}N \"From:\" a}"
+#define	ALL_PMT		"^еҦH"
+#define	NEWS_PMT	"^ЦܷsDոsA^絹@@̩Ψ̬ҭnH"
 #define SIGDASHES	"-- "
 
 
@@@@ -343,7 +343,7 @@@@
 	  role = combine_inherited_role(role);
 	else{				/* cancel reply */
 	    role = NULL;
-	    cmd_cancelled("Reply");
+	    cmd_cancelled("^");
 	    goto done_early;
 	}
     }
@@@@ -605,7 +605,7 @@@@
 #endif
 
     /* partially formatted outgoing message */
-    pine_send(outgoing, &body, "COMPOSE MESSAGE REPLY",
+    pine_send(outgoing, &body, "sH^",
 	      role, fcc.tptr, &reply, redraft_pos, NULL, NULL, 0);
   done:
     pine_free_body(&body);
@@@@ -683,7 +683,7 @@@@
 			 (ADDRESS *) NULL, env->from, 0);
 
     if(ret == 'x') {
-	cmd_cancelled("Reply");
+	cmd_cancelled("^");
 	return(0);
     }
 
@@@@ -732,7 +732,7 @@@@
 	       || (*saved_cc || *saved_resent))){
 	    *flags &= ~RSF_QUERY_REPLY_ALL;
 	    if((ret=want_to(ALL_PMT,'n','x',NO_HELP,WT_SEQ_SENSITIVE)) == 'x'){
-		cmd_cancelled("Reply");
+		cmd_cancelled("^");
 		return(0);
 	    }
 	    else if(ret == 'y')
@@@@ -890,21 +890,21 @@@@
     }
 
     if(flags & ROLE_REPLY)
-      prompt_fodder = "Reply";
+      prompt_fodder = "^";
     else if(flags & ROLE_FORWARD)
-      prompt_fodder = "Forward";
+      prompt_fodder = "H";
     else
-      prompt_fodder = "Compose";
+      prompt_fodder = "s";
 
     done = 0;
     while(!done){
 	if(curpat){
 	    help = h_role_confirm;
 	    ekey[0].name  = "Y";
-	    ekey[0].label = "Yes";
+	    ekey[0].label = "O";
 	    ekey[1].name  = "N";
-	    ekey[1].label = "No Role";
-	    ekey[2].label = "To Select Alternate Role";
+	    ekey[1].label = "_";
+	    ekey[2].label = "ܴN";
 	    if(curpat->patgrp && curpat->patgrp->nick)
 	      sprintf(prompt, "Use role \"%.40s\" for %s? ",
 		      curpat->patgrp->nick, prompt_fodder);
@@@@ -1523,8 +1523,8 @@@@
 {
     int ret, edited = 0;
     static ESCKEY_S rtq_opts[] = {
-	{'y', 'y', "Y", "Yes"},
-	{'n', 'n', "N", "No"},
+	{'y', 'y', "Y", "O"},
+	{'n', 'n', "N", "_"},
 	{-1, 0, NULL, NULL},	                  /* may be overridden below */
 	{-1, 0, NULL, NULL}
     };
@@@@ -1534,19 +1534,18 @@@@
       return(1);
 
     while(1){
-	sprintf(tmp_20k_buf, "Include %s%soriginal message%s in Reply%s%s%s? ",
-		(many > 1L) ? comatose(many) : "",
-		(many > 1L) ? " " : "",
-		(many > 1L) ? "s" : "",
-		F_ON(F_ENABLE_EDIT_REPLY_INDENT, ps) ? " (using \"" : "",
+	sprintf(tmp_20k_buf, "b^%s%s%s]t%s%s쥻TH",
+		F_ON(F_ENABLE_EDIT_REPLY_INDENT, ps) ? "]ϥ \"" : "",
 		F_ON(F_ENABLE_EDIT_REPLY_INDENT, ps) ? *prefix : "",
-		F_ON(F_ENABLE_EDIT_REPLY_INDENT, ps) ? "\")" : "");
+		F_ON(F_ENABLE_EDIT_REPLY_INDENT, ps) ? "\" ިХܥN^" : "",
+		(many > 1L) ? comatose(many) : "",
+		(many > 1L) ? " " : "");
 
 	if(F_ON(F_ENABLE_EDIT_REPLY_INDENT, ps)){
 	    rtq_opts[2].ch    = ctrl('R');
 	    rtq_opts[2].rval  = 'r';
 	    rtq_opts[2].name  = "^R";
-	    rtq_opts[2].label = "Edit Indent String";
+	    rtq_opts[2].label = "sިХܥN";
 	}
 	else
 	  rtq_opts[2].ch    = -1;
@@@@ -1557,7 +1556,7 @@@@
 				   rtq_opts, edited ? 'y' : 'n',
 				   'x', NO_HELP, RB_SEQ_SENSITIVE)){
 	  case 'x':
-	    cmd_cancelled("Reply");
+	    cmd_cancelled("^");
 	    return(-1);
 
 	  case 'r':
@@@@ -1576,7 +1575,7 @@@@
 
 		    switch(optionally_enter(buf, ps->ttyo->screen_rows > 4
 					    ? -FOOTER_ROWS(ps_global) : -1,
-					    0, 63, "Reply prefix : ", 
+					    0, 63, "ިХܥNG", 
 					    NULL, NO_HELP, &flags)){
 		      case 0:		/* entry successful, continue */
 			if(flags & OE_USER_MODIFIED){
@@@@ -1589,7 +1588,7 @@@@
 			break;
 
 		      case 1:
-			cmd_cancelled("Reply");
+			cmd_cancelled("^");
 
 		      case -1:
 			return(-1);
@@@@ -2653,9 +2652,9 @@@@
     ENVELOPE *env, *outgoing;
 {
     int    ret = 1;
-    static ESCKEY_S news_opt[] = { {'f', 'f', "F", "Follow-up"},
-				   {'r', 'r', "R", "Reply"},
-				   {'b', 'b', "B", "Both"},
+    static ESCKEY_S news_opt[] = { {'f', 'f', "F", "^ЦܪW"},
+				   {'r', 'r', "R", "^@@"},
+				   {'b', 'b', "B", "̬ҭn"},
 				   {-1, 0, NULL, NULL} };
 
     if(env->newsgroups && *env->newsgroups && !reply_poster_followup(env))
@@@@ -2679,7 +2678,7 @@@@
 
 	case 'x' :		/* cancel or unknown response */
 	default  :
-	  cmd_cancelled("Reply");
+	  cmd_cancelled("^");
 	  ret = 0;
 	  break;
       }
@@@@ -2687,7 +2686,7 @@@@
     if(ret > 1){
 	if(env->followup_to){
 	    q_status_message(SM_ORDER, 2, 3,
-			     "Posting to specified Followup-To groups");
+			     "ZnܯSw^вոs");
 	    outgoing->newsgroups = cpystr(env->followup_to);
 	}
 	else if(!outgoing->newsgroups)
@@@@ -3323,7 +3322,7 @@@@
 	     : 0;
 
     if(ret == 'x'){
-	cmd_cancelled("Forward");
+	cmd_cancelled("H");
 	so_give((STORE_S **)&msgtext);
 	goto clean;
     }
@@@@ -3337,7 +3336,7 @@@@
 	  role = combine_inherited_role(role);
 	else{				/* cancel reply */
 	    role = NULL;
-	    cmd_cancelled("Forward");
+	    cmd_cancelled("H");
 	    so_give((STORE_S **)&msgtext);
 	    goto clean;
 	}
@@@@ -3532,7 +3531,7 @@@@
       pine_simple_send(outgoing, &body, NULL, NULL, NULL, 1);
     else			/* partially formatted outgoing message */
       pine_send(outgoing, &body,
-		ps->nr_mode ? "SEND MESSAGE" : "FORWARD MESSAGE",
+		ps->nr_mode ? "eXH" : "HH",
 		role, NULL, NULL, redraft_pos, NULL, NULL, FALSE);
 
   clean:
@@@@ -3555,7 +3554,7 @@@@
     mail_gc(ps->mail_stream, GC_TEXTS);
 #endif
     q_status_message(SM_ORDER | SM_DING, 4, 5,
-		   "Error fetching message contents.  Can't forward message.");
+		   "^H󤺮eɵoͿ~CLkHHC");
     goto clean;
 }
 
@@@@ -3979,7 +3978,7 @@@@
 		if(confirm_role(ROLE_COMPOSE, &role))
 		  role = combine_inherited_role(role);
 		else{			/* cancel */
-		    cmd_cancelled("Composition");
+		    cmd_cancelled("s");
 		    display_message('x');
 		    mail_free_envelope(&env);
 		    pine_free_body(&body);
@


1.7
log
@Update to version 4.21.

PR:		14994
Submitted by:	maintainer
@
text
@@


1.6
log
@Update to version 4.20.

PR:		14575
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- pine/reply.c.orig	Tue Oct 12 01:30:36 1999
+++ pine/reply.c	Thu Oct 14 15:00:52 1999
@@@@ -108,9 +108,9 @@@@
d16 1
a16 1
@@@@ -341,7 +341,7 @@@@
d25 1
a25 1
@@@@ -603,7 +603,7 @@@@
d34 1
a34 1
@@@@ -681,7 +681,7 @@@@
d43 1
a43 1
@@@@ -730,7 +730,7 @@@@
d52 2
a53 15
@@@@ -830,9 +830,9 @@@@
     PAT_S          *curpat, *pat;
     PAT_STATE       pstate;
     static ESCKEY_S ekey[] = {
-	{'y', 'y', "Y", "Yes"},
-	{'n', 'n', "N", "No Role"},
-	{ctrl('T'), 2, "^T", "To Select Alternate Role"},
+	{'y', 'y', "Y", "O"},
+	{'n', 'n', "N", "_"},
+	{ctrl('T'), 2, "^T", "ܴN"},
 	{-1, 0, NULL, NULL}};
 
     if(!nonempty_patterns() || !role)
@@@@ -884,11 +884,11 @@@@
       curpat = first_pattern(ROLE_DO_ROLES, &pstate);
d67 14
a80 1
@@@@ -1504,8 +1504,8 @@@@
d91 1
a91 1
@@@@ -1515,19 +1515,18 @@@@
d117 1
a117 1
@@@@ -1538,7 +1537,7 @@@@
d126 1
a126 1
@@@@ -1557,7 +1556,7 @@@@
d135 1
a135 1
@@@@ -1570,7 +1569,7 @@@@
d144 1
a144 1
@@@@ -2579,9 +2578,9 @@@@
d157 1
a157 1
@@@@ -2605,7 +2604,7 @@@@
d166 1
a166 1
@@@@ -2613,7 +2612,7 @@@@
d175 1
a175 1
@@@@ -3249,7 +3248,7 @@@@
d184 1
a184 1
@@@@ -3263,7 +3262,7 @@@@
d193 1
a193 1
@@@@ -3458,7 +3457,7 @@@@
d202 1
a202 1
@@@@ -3481,7 +3480,7 @@@@
d211 1
a211 1
@@@@ -3861,7 +3860,7 @@@@
@


1.5
log
@Update to version 4.10.

PR:		10245
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- pine/reply.c.orig	Thu Jan 28 06:32:10 1999
+++ pine/reply.c	Tue Feb 23 15:55:36 1999
@@@@ -107,9 +107,9 @@@@
d16 2
a17 1
@@@@ -293,7 +293,7 @@@@
a19 1
 	    close_patterns(&pattern_h);
d24 2
a25 2
 
@@@@ -558,7 +558,7 @@@@
d34 1
a34 1
@@@@ -636,7 +636,7 @@@@
d43 1
a43 1
@@@@ -685,7 +685,7 @@@@
d52 29
a80 1
@@@@ -1406,8 +1406,8 @@@@
d91 1
a91 1
@@@@ -1417,19 +1417,18 @@@@
d117 1
a117 1
@@@@ -1440,7 +1439,7 @@@@
d126 1
a126 1
@@@@ -1459,7 +1458,7 @@@@
d135 1
a135 1
@@@@ -1472,7 +1471,7 @@@@
d144 1
a144 1
@@@@ -2476,9 +2475,9 @@@@
d157 1
a157 1
@@@@ -2502,7 +2501,7 @@@@
d166 1
a166 1
@@@@ -2510,7 +2509,7 @@@@
d175 1
a175 1
@@@@ -3148,7 +3147,7 @@@@
d184 2
a185 1
@@@@ -3163,7 +3162,7 @@@@
a187 1
 	    close_patterns(&pattern_h);
d193 1
a193 1
@@@@ -3360,7 +3359,7 @@@@
d202 1
a202 1
@@@@ -3383,7 +3382,7 @@@@
d211 9
@


1.4
log
@Cleanups from maintainer.

PR:		7468
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- pine/reply.c.orig	Wed Jul 15 08:40:00 1998
+++ pine/reply.c	Tue Aug  4 12:42:21 1998
@@@@ -88,9 +88,9 @@@@
d13 1
d15 11
a25 3
 /*
  * standard type of storage object used for body parts...
@@@@ -411,7 +411,7 @@@@
d31 1
a31 1
 	      fcc.tptr, &reply, NULL, NULL, NULL, 0);
d34 1
a34 1
@@@@ -485,7 +485,7 @@@@
d43 1
a43 1
@@@@ -534,7 +534,7 @@@@
d52 1
a52 1
@@@@ -1099,8 +1099,8 @@@@
d63 1
a63 1
@@@@ -1110,19 +1110,18 @@@@
d89 1
a89 1
@@@@ -1133,7 +1132,7 @@@@
d98 1
a98 1
@@@@ -1152,7 +1151,7 @@@@
d107 1
a107 1
@@@@ -1165,7 +1164,7 @@@@
d116 1
a116 1
@@@@ -1518,9 +1517,9 @@@@
d129 1
a129 1
@@@@ -1544,7 +1543,7 @@@@
d138 1
a138 1
@@@@ -1552,7 +1551,7 @@@@
d147 3
a149 3
@@@@ -1710,7 +1709,7 @@@@
      * up...
      */
d151 4
a154 3
-	q_status_message(SM_ORDER, 0, 3, "Forward message cancelled");
+	q_status_message(SM_ORDER, 0, 3, "HH");
 	goto clean_early;
d156 10
a165 2
     else if(ret == 'y'){			/* attach message[s]!!! */
@@@@ -1842,7 +1841,7 @@@@
d171 1
a171 1
 		NULL, NULL, NULL, NULL, NULL, FALSE);
d174 9
@


1.3
log
@Upgrade to 4.02,
Submitted by:	maintainer
@
text
@d1 16
a16 237
--- pine/send.c.orig	Tue Jul 21 03:02:18 1998
+++ pine/send.c	Tue Jul 28 08:35:07 1998
@@@@ -374,14 +374,14 @@@@
 		    mail_close(stream);
 		    if(ret == 'x'){
 			q_status_message(SM_ORDER, 0, 3,
-					 "Composition cancelled");
+					 "s");
 			return;
 		    }
 		}
 	    }
 	    else{
 		q_status_message1(SM_ORDER | SM_DING, 3, 3,
-				  "Can't open Interrupted mailbox: %s",
+				  "Lk}Q_HcG%s",
 				  file_path);
 		if(stream)
 		  mail_close(stream);
@@@@ -450,14 +450,14 @@@@
 
 		    if(ret == 'x'){
 			q_status_message(SM_ORDER, 0, 3,
-					 "Composition cancelled");
+					 "s");
 			done++;
 		    }
 		}
 	    }
 	    else{
 		q_status_message1(SM_ORDER | SM_DING, 3, 3,
-				  "Can't open Postponed mailbox: %s", mbox);
+				  "Lk}DȽwHcG%s", mbox);
 		if(stream)
 		  mail_close(stream);
 	    }
@@@@ -532,7 +532,7 @@@@
 
 			if(ret == 'x'){
 			    q_status_message(SM_ORDER, 0, 3,
-					     "Composition cancelled");
+					     "s");
 			    done++;
 			}
 		    }
@@@@ -616,7 +616,7 @@@@
 	  fs_give((void **)&tmp_fcc);
     }
 
-    pine_send(outgoing, &body, "COMPOSE MESSAGE", fcc,
+    pine_send(outgoing, &body, "sH", fcc,
 	      reply, redraft_pos, lcc, custom, fcc_is_sticky);
 
     if(reply){
@@@@ -683,7 +683,7 @@@@
      */
     if(!stream->nmsgs){
 	q_status_message(SM_ORDER | SM_DING, 3, 5,
-			 "Empty folder.  No messages really postponed!");
+			 "ŪHXCSHuQȽwI");
 	return(redraft_cleanup(stream, TRUE));
     }
     else if(stream == ps_global->mail_stream){
@@@@ -719,7 +719,7 @@@@
 	mn_give(&msgmap);
 
 	if(rv){
-	    q_status_message(SM_ORDER, 0, 3, "Composition cancelled");
+	    q_status_message(SM_ORDER, 0, 3, "s");
 	    (void) redraft_cleanup(stream, FALSE);
 	    return(0);				/* special case */
 	}
@@@@ -957,7 +957,7 @@@@
 	  if(b->type == TYPEMULTIPART){
 	      if(strucmp(b->subtype, "mixed")){
 		  q_status_message1(SM_INFO, 3, 4, 
-				 "Converting Multipart/%s to Multipart/Mixed", 
+				 "ഫ Multipart/%s to Multipart/Mixed", 
 				 b->subtype);
 		  fs_give((void **)&b->subtype);
 		  b->subtype = cpystr("mixed");
@@@@ -965,7 +965,7 @@@@
 	  }
 	  else{
 	      q_status_message2(SM_ORDER | SM_DING, 3, 4, 
-				"Unable to resume type %s/%s message",
+				"Lk~κA %s/%s H",
 				body_types[b->type], b->subtype);
 	      return(redraft_cleanup(stream, TRUE));
 	  }
@@@@ -979,7 +979,7 @@@@
 	    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",
+				  "Lk~FĤ@@D¤rG%s/%s",
 				  body_types[part->body.type], 
 				  part->body.subtype);
 		return(redraft_cleanup(stream, TRUE));
@@@@ -1307,7 +1307,7 @@@@
 
 	if(rc == 1 || (rc == 0 && !answer)) {
 	    q_status_message(SM_ORDER, 3, 4,
-		   "Send cancelled (User-id must be provided before sending)");
+		   "H(HeѨϥΪ̥N)");
 	    return(0);
 	}
 
@@@@ -1396,7 +1396,7 @@@@
 
 	if(rc == 1 || (rc == 0 && !answer)) {
 	    q_status_message(SM_ORDER, 3, 4,
-	  "Send cancelled (Host/domain name must be provided before sending)");
+	  "H(He D/ W)");
 	    return(0);
 	}
 
@@@@ -1452,7 +1452,7 @@@@
 
         if(rc == 1 || (rc == 0 && answer[0] == '\0')) {
             q_status_message(SM_ORDER, 3, 4,
-	       "Send cancelled (SMTP server must be provided before sending)");
+	       "H(He SMTP A)");
             return(0);
         }
 
@@@@ -1479,31 +1479,31 @@@@
 */
 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,    "a}ï",
    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,    "a}ï",
    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,    "a}ï",
    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,    "a}ï",
    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,    "a}ï",
    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,  "sDոsC",
    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,      "ƧXC",
    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,"a}ï",
    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,                 "ɮצC",
    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,
@@@@ -1538,7 +1538,7 @@@@
 
 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,    "a}ï",
    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,
@@@@ -1831,7 +1831,7 @@@@
     ekey[0].ch    = ctrl('T');
     ekey[0].rval  = 2;
     ekey[0].name  = "^T";
-    ekey[0].label = "To AddrBk";
+    ekey[0].label = "a}ï";
     ekey[1].ch    = -1;
 
     /*----------------------------------------------------------------------
@@@@ -1942,12 +1942,12 @@@@
 			opts[i].ch      = 'y';
 			opts[i].rval    = 'y';
 			opts[i].name    = "Y";
-			opts[i++].label = "Yes";
+			opts[i++].label = "O";
 
 			opts[i].ch      = 'n';
 			opts[i].rval    = 'n';
 			opts[i].name    = "N";
-			opts[i++].label = "No";
+			opts[i++].label = "_";
 
 			verbose_requested = 0;
 			if(F_ON(F_VERBOSE_POST, ps_global)){
@@@@ -1994,7 +1994,7 @@@@
 			    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 : "eH ",
 				    (verbose_requested || dsn_show)
 				      ? "(" : "",
 				    (verbose_requested)
@@@@ -2174,7 +2174,7 @@@@
 			}
 		    }
 		    else{
-			q_status_message(SM_ORDER, 0, 3, "Send cancelled");
+			q_status_message(SM_ORDER, 0, 3, "H");
 			retval = -1;
 		    }
 		}
@@@@ -2202,7 +2202,7 @@@@
 	    break;
 
 	  case 1:
-	    q_status_message(SM_ORDER, 0, 3, "Send cancelled");
+	    q_status_message(SM_ORDER, 0, 3, "H");
 	    done++;
 	    retval = -1;
 	    break;
@@@@ -2446,7 +2446,7 @@@@
 		break;
 
 	      case 'x': /* ^C */
-		q_status_message(SM_ORDER, 0, 3, "Message cancelled");
+		q_status_message(SM_ORDER, 0, 3, "H");
 		dprint(4, (debugfile, "=== send: cancelled\n"));
 		return;
 
@@@@ -2863,7 +2863,7 @@@@
a17 256
 		if(pf->canedit || !he->rich_header)
 		  q_status_message(SM_ORDER, 3, 3,
-			"Not allowed to change header \"From\"");
+			"\\ܼY \"From\"");
 
 		memset(he, 0, (size_t)sizeof(*he));
 		pf->he = NULL;
@@@@ -3206,7 +3206,7 @@@@
 				   ? "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, "H");
 		break;
 	    }
 
@@@@ -3484,15 +3484,15 @@@@
 		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, "H%s%s%s",
+				  (lc && *lc) ? " ýƻs \"" : "",
 				  (lc && *lc) ? lc : "",
 				  (lc && *lc) ? "\" file" : "");
 		break;
             }
 	    else{
 		q_status_message(SM_ORDER, 0, 4,
-		    "Continuing composition.  Message not postponed or sent");
+		    "~sCH󥼳QȽwΰeX");
 		body_start = 1;
 		continue; /* postpone failed, jump back in to composer */
             }
@@@@ -3557,8 +3557,8 @@@@
 	       && !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" : "");
+				 "LoDISFQeX%sC",
+				 fcc ? "Φs fcc" : "");
 		continue;
 	    }
 
@@@@ -3948,23 +3948,23 @@@@
     char *buf;
     int  *goodorbad;
 {
-    sprintf(buf, "Message %s%s%s%s%s%s%s.",
+    sprintf(buf, "H %s%s%s%s%s%s%s.",
 	    (result & P_NEWS_WIN)
-	       ? "posted" 
+	       ? "wZn" 
 	       : (result & P_NEWS_LOSE)
-	            ? "NOT posted" : "",
+	            ? "QZn" : "",
 	    ((result & P_NEWS_BITS) && (result & P_MAIL_BITS)
 	     && (result & P_FCC_BITS))
 	      ? ", "
 	      : ((result & P_NEWS_BITS) && (result & P_MAIL_BITS))
-	          ? " and " : "",
+	          ? "  " : "",
 	    (result & P_MAIL_WIN)
-	      ? "sent"
+	      ? "wHX"
 	      : (result & P_MAIL_LOSE)
-	          ? "NOT SENT" : "",
+	          ? "HX" : "",
 	    ((result & (P_MAIL_BITS | P_NEWS_BITS)) && (result & P_FCC_BITS))
-	      ? " and copied to " 
-	      : (result & P_FCC_WIN) ? "ONLY copied to " : "",
+	      ? " óQƻs " 
+	      : (result & P_FCC_WIN) ? "ȳQƻs " : "",
 	    (result & P_FCC_WIN) ? "\"" : "",
 	    (result & P_FCC_WIN) ? fcc_name  : "",
 	    (result & P_FCC_WIN) ? "\"" : "");
@@@@ -4291,12 +4291,12 @@@@
     opts[i].ch      = 'y';
     opts[i].rval    = 'y';
     opts[i].name    = "Y";
-    opts[i++].label = "Yes";
+    opts[i++].label = "O";
 
     opts[i].ch      = 'n';
     opts[i].rval    = 'n';
     opts[i].name    = "N";
-    opts[i++].label = "No";
+    opts[i++].label = "_";
 
     if(filters){
 	/* set global_filter_pointer to desired filter or NULL if none */
@@@@ -4304,12 +4304,12 @@@@
 	opts[i].ch      = ctrl('P');
 	opts[i].rval    = 10;
 	opts[i].name    = "^P";
-	opts[i++].label = "Prev Filter";
+	opts[i++].label = "e@@ӹLo";
 
 	opts[i].ch      = ctrl('N');
 	opts[i].rval    = 11;
 	opts[i].name    = "^N";
-	opts[i++].label = "Next Filter";
+	opts[i++].label = "U@@ӹLo";
 
 	if(F_ON(F_FIRST_SEND_FILTER_DFLT, ps_global))
 	  filters = filters->next;
@@@@ -4379,23 +4379,23 @@@@
 	  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, "eXH%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) ? "gѹLo \"" : "",
 		(filters)
 		  ? (filters->filter
 		      ? filters->filter
-		      : "unfiltered")
+		      : "gLo")
 		  : "",
 		(filters && filters->filter) ? "\"" : "",
 		(filters && (verbose_requested || background_requested))
 		  ? " " : "",
 		(verbose_requested || background_requested)
 		  ? "in " : "",
-		(verbose_requested) ? "verbose " : "",
-		(background_requested) ? "background " : "",
+		(verbose_requested) ? "ܲӸ` " : "",
+		(background_requested) ? "IeX " : "",
 		(verbose_requested || background_requested)
 		  ? "mode" : "",
 		(dsn_show
@@@@ -4410,11 +4410,11 @@@@
 	  *p = ' ';
 
 	if(verbose_label)
-	  opts[verbose_label].label = verbose_requested ? "Normal" : "Verbose";
+	  opts[verbose_label].label = verbose_requested ? "q`" : "ܲӸ`";
 
 	if(bg_label)
 	  opts[bg_label].label = background_requested
-				   ? "Foreground" : "Background";
+				   ? "e" : "I";
 
 	if(F_ON(F_DSN, ps_global)){
 	    if(dsn_requested & DSN_SHOW){
@@@@ -4438,11 +4438,11 @@@@
 	    break;
 	}
 	else if(rv == 'n'){			/* Declined! */
-	    rstr = "No Message Sent";
+	    rstr = "SHQeX";
 	    break;
 	}
 	else if(rv == 'z'){			/* Cancelled! */
-	    rstr = "Send Cancelled";
+	    rstr = "e";
 	    break;
 	}
 	else if(rv == 10)			/* PREVIOUS filter */
@@@@ -4624,7 +4624,7 @@@@
     if(body->type != TYPEOTHER){
 	rv = 1;
 	q_status_message3(SM_ORDER, 0, 3,
-	    "File %s attached as type %s/%s", file,
+	    "ɮ %s [ %s/%s", file,
 	    body_types[body->type],
 	    body->subtype ? body->subtype : rfc822_default_subtype(body->type));
     }
@@@@ -4673,7 +4673,7 @@@@
 	(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,
+			      "Mwɮ %s jpɵoͿ~G%s", fname,
 			      fnp = error_description(errno));
 	    dprint(1, (debugfile,
 		       "!!! Upload cmd \"%s\" failed for \"%s\": %s\n",
@@@@ -4685,7 +4685,7 @@@@
 	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, "}Һ޽uɵoͿ~");
 
     return(0);
 }
@@@@ -4738,7 +4738,7 @@@@
 	else if(reply->flags == REPLY_MSGNO)
 	  return;
 
-	we_cancel = busy_alarm(1, "Updating \"Answered\" Flags", NULL, 1);
+	we_cancel = busy_alarm(1, "bs \"w^\" X", NULL, 1);
 	if(!stream){
 	    if(stream = mail_open(NULL, reply->mailbox, OP_SILENT)){
 		ourstream++;
@@@@ -4816,7 +4816,7 @@@@
 		so_give(&tmpf_so);
 	    }
 	    else
-	      errstr = "Can't create space for filter temporary file.";
+	      errstr = "Lkإ߹LoȦsɡC";
 	}
 
 	if(!errstr){
@@@@ -4840,13 +4840,13 @@@@
 				so_give(&tmpf_so);
 			    }
 			    else
-			      errstr = "Can't open temp file filter wrote.";
+			      errstr = "Lk}ҹLoȦsɡC";
 			}
 			else
-			  errstr = "Filter command returned error.";
+			  errstr = "LoOǦ^~ȡC";
 		    }
 		    else
-		      errstr = "Can't exec filter text.";
+		      errstr = "LkLoC";
 		}
 		else
 		  errstr = gf_filter(cmd, key ? filter_session_key() : NULL,
@@@@ -4857,7 +4857,7 @@@@
 		if(errstr){
 		    int ch;
 
-		    fprintf(stdout, "\r\n%s  Hit return to continue.", errstr);
+		    fprintf(stdout, "\r\n%s  J return ~C", errstr);
 		    fflush(stdout);
 		    while((ch = read_char(300)) != ctrl('M')
 			  && ch != NO_OP_IDLE)
@@@@ -4950,7 +4950,7 @@@@
 	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, "LoL{DG%s",
 			  errstr);
 	dprint(1, (debugfile, "Filter FAILED: %s\n", errstr));
     }
@@@@ -5035,11 +5035,11 @@@@
 
 	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, "P±z@@NQp⬰ Pine ϥΪ̡I");
     }
     else
       q_status_message(SM_ORDER | SM_DING, 3, 4,
-		       "Problem creating space for message text.");
+		       "إ߰TrŶɵoͿ~C");
d19 5
a23 1
     mail_free_envelope(&outgoing);
d25 2
a26 1
@@@@ -5123,7 +5123,7 @@@@
d28 3
a30 4
     if(!pf){
 	q_status_message(SM_ORDER,3,3,
-	    "Can't send message. No recipients specified!");
+	    "LkeHC|wHHI");
d34 7
a40 64
@@@@ -5132,7 +5132,7 @@@@
     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, "bHH",
 			   send_bytes_to_send ? sent_percent : NULL, 1);
 
     /* try posting via local "<mta> <-t>" if specified */
@@@@ -5317,7 +5317,7 @@@@
 	    struct headerentry *last_he = NULL;
 
 	    sprintf(error_buf,
-		    "Mail not sent. Sending error%s%.40s",
+		    "H󥼳QHXCH~%s%.40s",
 		    (sending_stream && sending_stream->reply) ? ": ": ".",
 		    (sending_stream && sending_stream->reply)
 		      ? sending_stream->reply : "");
@@@@ -5390,7 +5390,7 @@@@
 	TIME_STAMP("smtp done", 1);
     }
     else if(!error_mess)
-      sprintf(error_mess = error_buf, "Error sending: %.60s",
+      sprintf(error_mess = error_buf, "HHɵoͿ~G%.60s",
 	      ps_global->c_client_error);
 
     if(verbose_file){
@@@@ -5487,12 +5487,12 @@@@
         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",
+		      "HX \"%.20s\" b <%.30s> |sbCns",
 		      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",
+		      "HX \"%s\" |sbCns",
 		      strsquish(tmp_20k_buf + 500, fcc, 40));
 
 	    if(force || want_to(tmp_20k_buf,'y','n',NO_HELP,WT_NORM) == 'y'){
@@@@ -5529,7 +5529,7 @@@@
 	    ok++;
 	}
 	else{
-	    sprintf(tmp_20k_buf,"Folder \"%s\" doesn't exist.  Create",
+	    sprintf(tmp_20k_buf,"HX \"%s\" |sbCns",
 		    strsquish(tmp_20k_buf + 500, fcc, 40));
 	    if(force || want_to(tmp_20k_buf,'y','n',NO_HELP,WT_NORM) == 'y'){
 		/*
@@@@ -5563,8 +5563,8 @@@@
 
 	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 ~G";
+		s2 = err_suffix ? err_suffix : " HSQHXνƻsC";
 
 		l1 = strlen(s1);
 		l2 = strlen(s2);
@@@@ -5582,10 +5582,10 @@@@
 
d42 35
a76 3
 	    else
-	      errstr = "Fcc creation error. Message NOT sent or copied.";
+	      errstr = "إ Fcc ɵoͿ~CHSQeXνƻsC";
d79 75
a153 110
-	  errstr = "Fcc creation rejected. Message NOT sent or copied.";
+	  errstr = "Fcc إ߾DڵCHSQeXνƻsC";
 
 	q_status_message(SM_ORDER | SM_DING, 3, 3, errstr);
     }
@@@@ -5633,7 +5633,7 @@@@
     if(label && *label){
 	char msg_buf[80];
 
-	strncat(strcpy(msg_buf, "Writing "), label, 70);
+	strncat(strcpy(msg_buf, "bgJ "), label, 70);
 	we_cancel = busy_alarm(1, msg_buf, NULL, 1);
     }
     else
@@@@ -5669,7 +5669,7 @@@@
 	we_cancel = 0;
 
 	q_status_message1(SM_ORDER | SM_DING, 3, 5,
-			  "Write to \"%s\" FAILED!!!", fcc);
+			  "gJ \"%s\" ѡIII", fcc);
 	dprint(1, (debugfile, "ERROR appending %s in \"%s\"",
 		   fcc, cntxt ? cntxt->context : "NULL"));
 	return(0);
@@@@ -6145,7 +6145,7 @@@@
 	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\"",
+                              "~ \"%s\"ALk[ɮ \"%s\"",
                               error_description(errno), pa->filename);
             display_message('x');
             continue;
@@@@ -6672,13 +6672,17 @@@@
 		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 */
 	}
     }
 
@@@@ -6847,6 +6851,9 @@@@
     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;
@@@@ -7180,7 +7187,7 @@@@
 	    break;
 
 	  default:
-	    q_status_message1(SM_ORDER,3,7,"Unknown header type: %s",pf->name);
+	    q_status_message1(SM_ORDER,3,7,"YκAG%s",pf->name);
 	    break;
 	}
     }
@@@@ -7508,7 +7515,8 @@@@
 
 	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 */
@@@@ -7522,7 +7530,7 @@@@
 
     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);
+			  "sXɵoͿ~ \"%s\"", encode_error);
 	display_message('x');
     }
 
@@@@ -7575,7 +7583,7 @@@@
       sprintf (*dst += strlen (*dst),"Content-Transfer-Encoding: %s\015\012",
 	       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 : ENCOTHER]);
@@@@ -8137,7 +8145,7 @@@@
 		   || (forbid = pine_header_forbidden(name))){
 		    if(forbid)
 		      q_status_message1(SM_ORDER, 3, 3,
-			    "Not allowed to change header \"%s\"", name);
+			    "\\ܼY \"%s\"", name);
d155 1
a155 2
 		    *t = save;
 		    continue;
@


1.2
log
@Upgrade to 4.00
Submitted by:	Liang Tai-hwa <avatar@@www.mmlab.cse.yzu.edu.tw>
@
text
@d1 689
a689 31
--- pine/status.c.orig	Tue Feb 25 05:57:40 1997
+++ pine/status.c	Sat Jan 17 21:24:26 1998
@@@@ -829,8 +829,8 @@@@
  * want_to's array passed to radio_buttions...
  */
 static ESCKEY_S yorn[] = {
-    {'y', 'y', "Y", "Yes"},
-    {'n', 'n', "N", "No"},
+    {'y', 'y', "Y", "O"},
+    {'n', 'n', "N", "_"},
     {-1, 0, NULL, NULL}
 };
 
@@@@ -1021,7 +1021,7 @@@@
     memset(fkey_table, NO_OP_COMMAND, 12 * sizeof(int));
     if(help_text != NO_HELP){		/* if shown, always at position 0 */
 	rb_keymenu.keys[0].name  = "?";
-	rb_keymenu.keys[0].label = "Help";
+	rb_keymenu.keys[0].label = "U";
 	setbitn(0, bitmap);
 	fkey_table[0] = ctrl('G');
 	start++;
@@@@ -1029,7 +1029,7 @@@@
 
     if(on_ctrl_C){			/* if shown, always at position 1 */
 	rb_keymenu.keys[1].name  = "^C";
-	rb_keymenu.keys[1].label = "Cancel";
+	rb_keymenu.keys[1].label = "";
 	setbitn(1, bitmap);
 	fkey_table[1] = ctrl('C');
 	start++;
@


1.1
log
@Add a lot of patches of chinese menu.
Submitted by:	maintainer
@
text
@@
