[SVN] r533 - in /trunk/cyrus-imapd-2.2.13/debian/patches: 0017-upstream-no-body-empty-string-instead-of-null.dpatch 00list

[debian at incase.de]

Author: sven
Date: Sun Aug  6 19:59:57 2006
New Revision: 533

URL: https://mail.incase.de/viewcvs?rev=533&root=cyrus22&view=rev
Log:
Add upstream patch: return empty string instead of NULL for empty body parts

Added:
    trunk/cyrus-imapd-2.2.13/debian/patches/0017-upstream-no-body-empty-string-instead-of-null.dpatch   (with props)
Modified:
    trunk/cyrus-imapd-2.2.13/debian/patches/00list

Added: trunk/cyrus-imapd-2.2.13/debian/patches/0017-upstream-no-body-empty-string-instead-of-null.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0017-upstream-no-body-empty-string-instead-of-null.dpatch?rev=533&root=cyrus22&view=auto
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0017-upstream-no-body-empty-string-instead-of-null.dpatch (added)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0017-upstream-no-body-empty-string-instead-of-null.dpatch Sun Aug  6 19:59:57 2006
@@ -1,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0017-upstream-no-body-empty-string-instead-of-null by murch at andrew.cmu.edu
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: return an empty string for empty body parts instead of NULL
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.13/lib/charset.c /tmp/dpep.RuEsfH/cyrus-imapd-2.2.13/lib/charset.c
+--- cyrus-imapd-2.2.13/lib/charset.c	2005-03-12 23:09:22.000000000 +0100
++++ /tmp/dpep.RuEsfH/cyrus-imapd-2.2.13/lib/charset.c	2006-08-06 19:55:36.020854674 +0200
+@@ -39,7 +39,7 @@
+  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ /*
+- * $Id: charset.c,v 1.44 2003/10/22 18:50:12 rjs3 Exp $
++ * $Id: charset.c,v 1.45 2006/06/14 12:44:05 murch Exp $
+  */
+ #include <config.h>
+ #include <ctype.h>
+@@ -861,24 +861,22 @@
+ 	return (char *) msg_base;
+ 
+     case ENCODING_QP:
+-	if (alloced < len)
+-	    *retval = xrealloc(*retval, len);
+-	*outlen = charset_readqp(&state, *retval, len);
+-	return (*outlen ? *retval : NULL);
++	state.rawproc = charset_readqp;
++	break;
+ 
+     case ENCODING_BASE64:
+-	if (alloced < len)
+-	    *retval = xrealloc(*retval, len);
+-	*outlen = charset_readbase64(&state, *retval, len);
+-	return (*outlen ? *retval : NULL);
++	state.rawproc = charset_readbase64;
++	break;
+ 
+     default:
+ 	/* Don't know encoding--nothing can match */
+ 	return NULL;
+     }
+ 
+-    /* should never get here */
+-    return NULL;
++    if (alloced < len+1) *retval = xrealloc(*retval, len+1);
++    *outlen = (*state.rawproc)(&state, *retval, len);
++    (*retval)[*outlen] = '\0';
++    return *retval;
+ }
+ 
+ /*

Propchange: trunk/cyrus-imapd-2.2.13/debian/patches/0017-upstream-no-body-empty-string-instead-of-null.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/cyrus-imapd-2.2.13/debian/patches/00list
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/00list?rev=533&root=cyrus22&r1=532&r2=533&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/00list Sun Aug  6 19:59:57 2006
@@ -14,6 +14,7 @@
 0014-upstream-fix-locks-during-reconstruction.dpatch
 0015-upstream-fix-logic-error-in-imapoptions.dpatch
 0016-upstream-fix-typos.dpatch
+0017-upstream-no-body-empty-string-instead-of-null.dpatch
 0090-fix-casts.dpatch
 01-fix_Makefile.in.dpatch
 02-add_mkinstalldirs.dpatch