[Python-checkins] r54922 - python/branches/release25-maint/Modules/binascii.c

[kristjan.jonsson]

Author: kristjan.jonsson
Date: Sun Apr 22 12:18:46 2007
New Revision: 54922

Modified:
   python/branches/release25-maint/Modules/binascii.c
Log:
Properly implement Georg Brandl's Patch #1185447 to the 2.5 maintainance branch

Modified: python/branches/release25-maint/Modules/binascii.c
==============================================================================
--- python/branches/release25-maint/Modules/binascii.c	(original)
+++ python/branches/release25-maint/Modules/binascii.c	Sun Apr 22 12:18:46 2007
@@ -1160,13 +1160,14 @@
 		if ((data[in] > 126) ||
 		    (data[in] == '=') ||
 		    (header && data[in] == '_') ||
-		    ((data[in] == '.') && (linelen == 1)) ||
+		    ((data[in] == '.') && (linelen == 0) &&
+		     (data[in+1] == '\n' || data[in+1] == '\r' || data[in+1] == 0)) ||
 		    (!istext && ((data[in] == '\r') || (data[in] == '\n'))) ||
 		    ((data[in] == '\t' || data[in] == ' ') && (in + 1 == datalen)) ||
 		    ((data[in] < 33) &&
 		     (data[in] != '\r') && (data[in] != '\n') &&
-		     (!quotetabs ||
-		      (quotetabs && ((data[in] != '\t') && (data[in] != ' '))))))
+		     (quotetabs ||
+		     	(!quotetabs && ((data[in] != '\t') && (data[in] != ' '))))))
 		{
 			if ((linelen + 3) >= MAXLINESIZE) {
 				linelen = 0;
@@ -1231,13 +1232,14 @@
 		if ((data[in] > 126) ||
 		    (data[in] == '=') ||
 		    (header && data[in] == '_') ||
-		    ((data[in] == '.') && (linelen == 1)) ||
+		    ((data[in] == '.') && (linelen == 0) &&
+		     (data[in+1] == '\n' || data[in+1] == '\r' || data[in+1] == 0)) ||
 		    (!istext && ((data[in] == '\r') || (data[in] == '\n'))) ||
 		    ((data[in] == '\t' || data[in] == ' ') && (in + 1 == datalen)) ||
 		    ((data[in] < 33) &&
 		     (data[in] != '\r') && (data[in] != '\n') &&
-		     (!quotetabs ||
-		      (quotetabs && ((data[in] != '\t') && (data[in] != ' '))))))
+		     (quotetabs ||
+		     	(!quotetabs && ((data[in] != '\t') && (data[in] != ' '))))))
 		{
 			if ((linelen + 3 )>= MAXLINESIZE) {
 				odata[out++] = '=';