summaryrefslogtreecommitdiff
path: root/pith
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2015-01-25 18:52:13 -0700
committerEduardo Chappa <chappa@washington.edu>2015-01-25 18:52:13 -0700
commit4db5ba9a511564e4a3cb3d2b67bce4bb171eae4f (patch)
tree8ff91f6581acb023e7a3d989414cc925927b49b3 /pith
parent2ea73d14866f5eb39bc6a9aab36312abd6fa525c (diff)
downloadalpine-4db5ba9a511564e4a3cb3d2b67bce4bb171eae4f.tar.xz
* new version 2.20.1
* Ignore message from smtp server after a successful authentication challenge. * Alpine would not set include and lib paths for OpenSSL if this was installed in /usr/local/ssl. * If the .pinerc file is a symbolic link, Alpine might not write its contents when saving its configuration. * The _INIT_ token does not skip over non-alpha numeric characters in the name. Reported by Andreas Fehr. * If SSLDIR is defined somehow, do not disable S/MIME if the SSLCERTSDIR is not found. * Mismatch in size of UCS and CELL caused a corruption in the content of a pointer, which made the speller in PC-Alpine get the content of a word incorrectly. * Update splash screen to version 2.20 in main repository. * Skip testing openssl compatibility version when cross-compilation is detected. Fix contributed by Antti Seppälä.
Diffstat (limited to 'pith')
-rw-r--r--pith/conf.c15
-rw-r--r--pith/pine.hlp39
-rw-r--r--pith/reply.c5
3 files changed, 52 insertions, 7 deletions
diff --git a/pith/conf.c b/pith/conf.c
index aca7ea28..e8c1ceb9 100644
--- a/pith/conf.c
+++ b/pith/conf.c
@@ -5938,16 +5938,21 @@ write_pinerc(struct pine *ps, EditWhich which, int flags)
slpath = cpystr(slink);
else{
char * basep;
+ int n;
+
basep = strrchr(filename, '/');
- if(basep == NULL){
+ if(basep != NULL){
*basep = '\0';
- slpath = (char *) fs_get((strlen(filename) + strlen(slink) + 2)*sizeof(char));
- snprintf(slpath, sizeof(slpath), "%s/%s", filename, slink);
+ n = strlen(filename) + strlen(slink) + 2;
+ slpath = (char *) fs_get(n*sizeof(char));
+ snprintf(slpath, n, "%s/%s", filename, slink);
*basep = '/';
} else {
- slpath = (char *) fs_get((strlen(ps_global->home_dir) + strlen(slink) + 2)*sizeof(char));
- snprintf(slpath, sizeof(slpath), "%s/%s", ps_global->home_dir, slink);
+ n = strlen(ps_global->home_dir) + strlen(slink) + 2;
+ slpath = (char *) fs_get(n*sizeof(char));
+ snprintf(slpath, n, "%s/%s", ps_global->home_dir, slink);
}
+ slpath[n-1] = '\0';
}
file_attrib_copy(tmp, slpath);
r = rename_file(tmp, slpath);
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 3152fb7e..f360dda6 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 67 2015-01-07 21:01:57
+Alpine Commit 68 2015-01-25 18:52:07
============= h_news =================
<HTML>
<HEAD>
@@ -178,6 +178,41 @@ addresses bugs found in previous releases and has a few additions as well.
<P>
Additions include:
+<UL>
+ <LI> Ignore message from smtp server after a successful authentication
+ challenge.
+ <LI> If SSLDIR is defined somehow, do not disable S/MIME if the
+ SSLCERTSDIR is not found.
+</UL>
+
+<P>
+Bugs that have been addressed include:
+<UL>
+ <LI> Alpine would not set include and lib paths for OpenSSL if this was
+ installed in /usr/local/ssl.
+
+ <LI> If the .pinerc file is a symbolic link, Alpine might not write its
+ contents when saving its configuration.
+
+ <LI> The _INIT_ token does not skip over non-alpha numeric characters in
+ the name. Reported by Andreas Fehr.
+
+ <LI> Mismatch in size of UCS and CELL caused a corruption in the
+ content of a pointer, which made the speller in PC-Alpine get
+ the content of a word incorrectly.
+
+ <LI> Skip testing openssl compatibility version when cross-compilation
+ is detected. Fix contributed by Antti Seppälä.
+
+</UL>
+
+
+<P>
+Version 2.20 addresses bugs found in previous releases and has several
+additions as well.
+
+<P>
+Additions include:
<P>
<UL>
@@ -362,7 +397,7 @@ Additions include:
<P>
<UL>
- <LI> Alpine requires version 1.0.1c of Openssl to build.
+ <LI> Alpine requires version 1.0.0c of Openssl to build.
<LI> Increase encryption of S/MIME encrypted messages.
<LI> Pico: Improvements in justification of paragraphs: lines that begin
with a quote string, followed by a space were considered individual paragraphs,
diff --git a/pith/reply.c b/pith/reply.c
index 52a3c81c..54223e68 100644
--- a/pith/reply.c
+++ b/pith/reply.c
@@ -820,6 +820,10 @@ reply_quote_initials(char *name)
continue;
}
+ /* skip over non-alpha stuff */
+ if(i == 0 && !isalnum((unsigned char) cbuf.cbuf[0]))
+ goto reset_cbuf;
+
/* copy cbuf */
for(j = 0; j <= i; j++) *w++ = cbuf.cbuf[j];
@@ -827,6 +831,7 @@ reply_quote_initials(char *name)
while(*s && (unsigned char) *s != ' ')
s++;
+reset_cbuf:
cbuf.cbuf[i = 0] = '\0';
cbuf.cbufp = cbuf.cbuf;
cbuf.cbufend = cbuf.cbuf;