Bugfix update to s-nail 14.2.2
Thanks to jca -at- wxcvbn.org whose post inspired sdaoden -at- gmail.com to roll a bugfix release.
This commit is contained in:
parent
ce625eb044
commit
b6f7d3cc6d
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.1.1.1 2013/03/29 03:54:33 william Exp $
|
||||
# $OpenBSD: Makefile,v 1.2 2013/05/02 02:11:53 william Exp $
|
||||
|
||||
COMMENT= enhanced, MIME capable Berkeley Mail
|
||||
|
||||
DISTNAME= s-nail-14.2
|
||||
DISTFILES= ${DISTNAME:S/./_/}.tar.gz
|
||||
DISTNAME= s-nail-14.2.2
|
||||
DISTFILES= ${DISTNAME:S/./_/g}.tar.gz
|
||||
CATEGORIES= mail
|
||||
HOMEPAGE= http://sdaoden.users.sourceforge.net/code.html#s-nail
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (s-nail-14_2.tar.gz) = T02Y5tChotCqrsFCI9BJmuPbNPtGxVa7J70qNUc0pzU=
|
||||
SIZE (s-nail-14_2.tar.gz) = 349557
|
||||
SHA256 (s-nail-14_2_2.tar.gz) = YCoxCFVzQm0i8EKyqN1iQ+eUUBMN579aTYYTxcjRMUo=
|
||||
SIZE (s-nail-14_2_2.tar.gz) = 351039
|
||||
|
@ -1,53 +0,0 @@
|
||||
$OpenBSD: patch-cmd1_c,v 1.1.1.1 2013/03/29 03:54:34 william Exp $
|
||||
|
||||
fix bsdcompat message index, from upstream:
|
||||
cmd1.c:hprf(): fix subject length calculation..
|
||||
|
||||
|
||||
--- cmd1.c.orig Fri Mar 15 07:20:17 2013
|
||||
+++ cmd1.c Wed Mar 27 14:26:05 2013
|
||||
@@ -582,9 +582,8 @@ jputc:
|
||||
fromlen = ABS(n);
|
||||
if (isto) /* XXX tr()! */
|
||||
fromlen -= 3;
|
||||
- fprintf(f, "%s%s", isto ? "To " : "",
|
||||
+ subjlen -= fprintf(f, "%s%s", isto ? "To " : "",
|
||||
colalign(name, fromlen, n));
|
||||
- subjlen -= ABS(n);
|
||||
break;
|
||||
case 'd':
|
||||
if (datefmt != NULL) {
|
||||
@@ -613,6 +612,7 @@ jputc:
|
||||
subjlen -= fprintf(f, "%*ld", n,
|
||||
mp->m_xlines);
|
||||
else {
|
||||
+ n = ABS(n);
|
||||
subjlen -= n;
|
||||
while (n--)
|
||||
putc(' ', f);
|
||||
@@ -633,11 +633,12 @@ jputc:
|
||||
B = 1;
|
||||
/*FALLTHRU*/
|
||||
case 's':
|
||||
- n = (n != 0) ? n : subjlen - 2;
|
||||
+ if (n == 0)
|
||||
+ n = subjlen - 2;
|
||||
if (n > 0 && s < 0)
|
||||
n = -n;
|
||||
if (B)
|
||||
- n -= 2;
|
||||
+ n -= (n < 0) ? -2 : 2;
|
||||
if (subjline != NULL && n != 0) {
|
||||
/* pretty pathetic */
|
||||
fprintf(f, B ? "\"%s\"" : "%s",
|
||||
@@ -667,9 +668,8 @@ jputc:
|
||||
for (i=msgCount; i>999; i/=10)
|
||||
n++;
|
||||
}
|
||||
- fprintf(f, "%*ld", n, threaded ?
|
||||
+ subjlen -= fprintf(f, "%*ld", n, threaded ?
|
||||
mp->m_threadpos : mesg);
|
||||
- subjlen -= n;
|
||||
break;
|
||||
case 'c':
|
||||
#ifdef USE_SCORE
|
Loading…
Reference in New Issue
Block a user