Updated lastchar patch from upstream.

3 files changed, 48 insertions, 23 deletions

diff --git a/net-news/slrn/ChangeLog b/net-news/slrn/ChangeLog
index aab38de84d48..99eaac0331fc 100644
--- a/net-news/slrn/ChangeLog
+++ b/net-news/slrn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-news/slrn
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/slrn/ChangeLog,v 1.31 2004/10/17 01:51:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/slrn/ChangeLog,v 1.32 2004/11/12 23:42:55 swegener Exp $
+
+  13 Nov 2004; Sven Wegener <swegener@gentoo.org>
+  -files/0.9.8.1/slrn-0.9.8.1-lastchar.diff,
+  +files/0.9.8.1/slrn-0.9.8.1-lastchar2.diff, slrn-0.9.8.1.ebuild:
+  Updated lastchar patch from upstream.
 
   17 Oct 2004; Sven Wegener <swegener@gentoo.org>
   +files/0.9.8.1/slrn-0.9.8.1-fetch.diff,
diff --git a/net-news/slrn/files/0.9.8.1/slrn-0.9.8.1-lastchar.diff b/net-news/slrn/files/0.9.8.1/slrn-0.9.8.1-lastchar2.diff
index 04e8b59a6f21..1e02ad3b968f 100644
--- a/net-news/slrn/files/0.9.8.1/slrn-0.9.8.1-lastchar.diff
+++ b/net-news/slrn/files/0.9.8.1/slrn-0.9.8.1-lastchar2.diff
@@ -1,6 +1,6 @@
-diff -ur slrn-0.9.8.1.orig/src/group.c slrn-0.9.8.1/src/group.c
+diff -ru slrn-0.9.8.1.orig/src/group.c slrn-0.9.8.1/src/group.c
 --- slrn-0.9.8.1.orig/src/group.c	2004-08-15 23:09:31.000000000 +0200
-+++ slrn-0.9.8.1/src/group.c	2004-10-14 14:53:47.788281512 +0200
++++ slrn-0.9.8.1/src/group.c	2004-11-05 23:01:51.391610936 +0100
 @@ -3,7 +3,7 @@
   This file is part of SLRN.
  
@@ -10,20 +10,22 @@ diff -ur slrn-0.9.8.1.orig/src/group.c slrn-0.9.8.1/src/group.c
  
   This program is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by the Free
-@@ -2605,7 +2605,8 @@
+@@ -2605,7 +2605,10 @@
  	if ((p == pmax) || (p == vline))
  	  continue;
       
 -	vline[vlen-1] = 0;	       /* kill \n and NULL terminate */
 +	if (vline[vlen-1] == '\n')
 +	  vline[vlen-1] = 0;
++	else
++	  vline[vlen] = 0;
  
  	if (-1 == add_group (vline, (unsigned int) (p - vline),
  			     ((ch == '!') ? GROUP_UNSUBSCRIBED : 0), 0, 0))
-diff -ur slrn-0.9.8.1.orig/src/misc.c slrn-0.9.8.1/src/misc.c
+diff -ru slrn-0.9.8.1.orig/src/misc.c slrn-0.9.8.1/src/misc.c
 --- slrn-0.9.8.1.orig/src/misc.c	2004-09-27 23:30:35.000000000 +0200
-+++ slrn-0.9.8.1/src/misc.c	2004-10-14 14:53:47.839273760 +0200
-@@ -1165,8 +1165,9 @@
++++ slrn-0.9.8.1/src/misc.c	2004-11-05 23:02:09.519855024 +0100
+@@ -1165,8 +1165,11 @@
  	     if (vlen == 0) continue;
  	     
  	     line = slrn_safe_malloc (vlen+512); /* add some for MIME overhead */
@@ -32,43 +34,51 @@ diff -ur slrn-0.9.8.1.orig/src/misc.c slrn-0.9.8.1/src/misc.c
 +	     strncpy (line, vline, vlen);
 +	     if (line[vlen-1] == '\n')
 +	       line[vlen-1] = 0;
++	     else
++	       line[vlen] = 0;
  
  	     if (header)
  	       {
-diff -ur slrn-0.9.8.1.orig/src/post.c slrn-0.9.8.1/src/post.c
+diff -ru slrn-0.9.8.1.orig/src/post.c slrn-0.9.8.1/src/post.c
 --- slrn-0.9.8.1.orig/src/post.c	2004-09-28 11:05:54.000000000 +0200
-+++ slrn-0.9.8.1/src/post.c	2004-10-14 14:53:47.888266312 +0200
-@@ -467,7 +467,8 @@
++++ slrn-0.9.8.1/src/post.c	2004-11-05 23:02:53.936102728 +0100
+@@ -467,7 +467,10 @@
     linenum = 0;
     while ((NULL != (vline = vgets (vp, &vlen))) && (*vline != '\n'))
       {
 -	vline[vlen-1] = 0;
 +	if (vline[vlen-1] == '\n')
 +	  vline[vlen-1] = 0;
++	else
++	  vline[vlen] = 0;
  	linenum++;
  	if (0 == slrn_case_strncmp ((unsigned char *)vline,
  				    (unsigned char *) "Cc: ", 4))
-@@ -540,7 +541,8 @@
+@@ -540,7 +543,10 @@
  
     while ((NULL != (vline = vgets (vp, &vlen))) && (*vline != '\n'))
       {
 -	vline[vlen-1] = 0;
 +	if (vline[vlen-1] == '\n')
 +	  vline[vlen-1] = 0;
++	else
++	  vline[vlen] = 0;	
  	linenum++;
  	if (linenum == cc_line) continue;
  	if (is_empty_header (vline)) continue;
-@@ -593,7 +595,8 @@
+@@ -593,7 +599,10 @@
  
     while (NULL != (vline = vgets (vp, &vlen)))
       {
 -	vline[vlen-1] = 0;
 +	if (vline[vlen-1] == '\n')
 +	  vline[vlen-1] = 0;
++	else
++	  vline[vlen] = 0;	
  	fputs (vline, pp);
  	fputs ("\n", pp);
       }
-@@ -1411,8 +1414,9 @@
+@@ -1411,8 +1420,11 @@
  	if (vlen == 0) continue;
  
  	linep = slrn_safe_malloc (vlen+512); /* add some for MIME overhead */
@@ -77,46 +87,54 @@ diff -ur slrn-0.9.8.1.orig/src/post.c slrn-0.9.8.1/src/post.c
 +	strncpy (linep, vline, vlen);
 +	if (linep[vlen-1] == '\n')
 +	  linep[vlen-1] = 0;	/* kill \n and NULL terminate */
++	else
++	  linep[vlen] = 0;
  	
  	if (header)
  	  {
-diff -ur slrn-0.9.8.1.orig/src/slrnpull.c slrn-0.9.8.1/src/slrnpull.c
+diff -ru slrn-0.9.8.1.orig/src/slrnpull.c slrn-0.9.8.1/src/slrnpull.c
 --- slrn-0.9.8.1.orig/src/slrnpull.c	2004-02-28 23:08:17.000000000 +0100
-+++ slrn-0.9.8.1/src/slrnpull.c	2004-10-14 14:53:47.940258408 +0200
-@@ -3273,7 +3273,8 @@
++++ slrn-0.9.8.1/src/slrnpull.c	2004-11-05 23:03:18.859313824 +0100
+@@ -3273,7 +3273,10 @@
  	
  	if (NULL != (vline = vgets (vp, &vlen)))
  	  {
 -	     vline[vlen] = 0; /* make sure line is NULL terminated */
 +	     if (vline[vlen-1] == '\n')
 +	       vline[vlen-1] = 0; /* make sure line is NULL terminated */
++	     else
++	       vline[vlen] = 0;
  	     group->headers = slrn_ranges_from_newsrc_line (vline);
  	  }
  	
-@@ -3382,7 +3383,8 @@
+@@ -3382,7 +3385,10 @@
  	     if (NULL == (group = find_group_type (vline)))
  	       continue;
  	     
 -	     vline[vlen-1] = 0;	       /* kill \n and NULL terminate */
 +	     if (vline[vlen-1] == '\n')
 +	       vline[vlen-1] = 0;
++	     else
++	       vline[vlen] = 0;
  	     
  	     r = slrn_ranges_from_newsrc_line (p+1);
  	     group->requests = slrn_ranges_merge (group->requests, r);
-diff -ur slrn-0.9.8.1.orig/src/spool.c slrn-0.9.8.1/src/spool.c
+diff -ru slrn-0.9.8.1.orig/src/spool.c slrn-0.9.8.1/src/spool.c
 --- slrn-0.9.8.1.orig/src/spool.c	2004-08-15 22:48:13.000000000 +0200
-+++ slrn-0.9.8.1/src/spool.c	2004-10-14 14:53:47.988251112 +0200
-@@ -1757,7 +1757,8 @@
++++ slrn-0.9.8.1/src/spool.c	2004-11-05 23:04:17.628379568 +0100
+@@ -1757,7 +1757,10 @@
     
     if (NULL != (vline = vgets (vp, &vlen)))
       {
 -	vline[vlen] = 0; /* make sure line is NULL terminated */
 +	if (vline[vlen-1] == '\n')
 +	  vline[vlen-1] = 0; /* make sure line is NULL terminated */
++	else
++	  vline[vlen] = 0;
  	retval = slrn_ranges_from_newsrc_line (vline);
       }
     
-@@ -1787,8 +1788,9 @@
+@@ -1787,8 +1790,11 @@
  	if ((p == pmax) || (p == vline) ||
  	    (strncmp(vline, group, (p-vline))))
  	  continue;
@@ -125,6 +143,8 @@ diff -ur slrn-0.9.8.1.orig/src/spool.c slrn-0.9.8.1/src/spool.c
 +
 +	if (vline[vlen-1] == '\n')
 +	  vline[vlen-1] = 0;
++	else
++	  vline[vlen] = 0;
  	
  	retval = slrn_ranges_from_newsrc_line (p+1);
  	break;
diff --git a/net-news/slrn/slrn-0.9.8.1.ebuild b/net-news/slrn/slrn-0.9.8.1.ebuild
index 66b40d1faae2..5300a6c5e715 100644
--- a/net-news/slrn/slrn-0.9.8.1.ebuild
+++ b/net-news/slrn/slrn-0.9.8.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/slrn/slrn-0.9.8.1.ebuild,v 1.2 2004/10/17 01:51:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/slrn/slrn-0.9.8.1.ebuild,v 1.3 2004/11/12 23:42:55 swegener Exp $
 
 inherit eutils
 
 # Upstream patches from http://slrn.sourceforge.net/patches/
 # ${FILESDIR}/${PV}/${P}-<name>.diff
-SLRN_PATCHES="fetch lastchar"
+SLRN_PATCHES="fetch lastchar2"
 
 DESCRIPTION="s-lang Newsreader"
 HOMEPAGE="http://slrn.sourceforge.net/"