summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2020-06-13 14:13:56 -0600
committerEduardo Chappa <chappa@washington.edu>2020-06-13 14:13:56 -0600
commitd8d8e7ed38592812cc1238b87d18f46b9e83a45e (patch)
tree3c40d6b1c1a7395e89d2a34e4f0116976bfed3d7
parent5417727912422ac3d58f3cc3fd78c75b2a060fe3 (diff)
downloadalpine-d8d8e7ed38592812cc1238b87d18f46b9e83a45e.tar.xz
* Selecting by subject might not copy the subject of the current message
to the selection text correctly. Reported by Iosif Fettich.
-rw-r--r--alpine/mailcmd.c12
-rw-r--r--pith/pine.hlp17
2 files changed, 15 insertions, 14 deletions
diff --git a/alpine/mailcmd.c b/alpine/mailcmd.c
index 794e335a..e26495ed 100644
--- a/alpine/mailcmd.c
+++ b/alpine/mailcmd.c
@@ -8250,7 +8250,7 @@ select_by_text(MAILSTREAM *stream, MSGNO_S *msgmap, long int msgno, SEARCHSET **
{
int r, ku, type, we_cancel = 0, flags, rv, ekeyi = 0;
int not = 0, me = 0;
- char sstring[80], savedsstring[80], tmp[128];
+ char sstring[80], tmp[128];
char *p, *sval = NULL;
char buftmp[MAILTMPLEN], namehdr[80];
ESCKEY_S ekey[8];
@@ -8264,7 +8264,6 @@ select_by_text(MAILSTREAM *stream, MSGNO_S *msgmap, long int msgno, SEARCHSET **
static char *dont_match_me = N_("[Don't_Match_My_Addresses]");
ps_global->mangled_footer = 1;
- savedsstring[0] = '\0';
ekey[0].ch = ekey[1].ch = ekey[2].ch = ekey[3].ch = -1;
while(1){
@@ -8497,15 +8496,8 @@ select_by_text(MAILSTREAM *stream, MSGNO_S *msgmap, long int msgno, SEARCHSET **
if(env && env->subject && env->subject[0]){
char *q = NULL;
- snprintf(buftmp, sizeof(buftmp), "%.75s", env->subject);
- buftmp[sizeof(buftmp)-1] = '\0';
q = (char *) rfc1522_decode_to_utf8((unsigned char *)tmp_20k_buf,
- SIZEOF_20KBUF, buftmp);
- if(q != env->subject){
- snprintf(savedsstring, sizeof(savedsstring), "%.70s", q);
- savedsstring[sizeof(savedsstring)-1] = '\0';
- }
-
+ SIZEOF_20KBUF, env->subject);
snprintf(sstring, sizeof(sstring), "%s", q);
sstring[sizeof(sstring)-1] = '\0';
}
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 912dcef4..28d175cb 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
reasonable place to be called from.
Dummy change to get revision in pine.hlp
============= h_revision =================
-Alpine Commit 444 2020-06-12 20:33:43
+Alpine Commit 445 2020-06-13 14:13:45
============= h_news =================
<HTML>
<HEAD>
@@ -171,12 +171,13 @@ is available as is a world wide web based version designed to run under the
Apache web server.
-<H2>New in Alpine <!--#echo var="ALPINE_VERSION"--> (<!--#echo var="ALPINE_REVISION"-->)</H2>
This is a development version of Alpine. These enhancements are
released after the release of version 2.22. Please report any
problems you find with this release.
+<H2>New in Alpine <!--#echo var="ALPINE_VERSION"--> (<!--#echo var="ALPINE_REVISION"-->)</H2>
+
<P> Additions include:
<UL>
<LI> Implementation of XOAUTH2 authentication support for Outlook.
@@ -184,8 +185,16 @@ problems you find with this release.
</UL>
<P>
-Version <!--#echo var="ALPINE_VERSION"--> addresses bugs found in previous releases and
-has several additions as well.
+Bugs addressed:
+<P>
+
+<UL>
+ <LI> Selecting by subject might not copy the subject of the current message
+ to the selection text correctly. Reported by Iosif Fettich.
+</UL>
+
+<P>
+Version 2.22 addresses bugs found in previous releases and has several additions as well.
<P> Additions include:
<UL>