# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1084513898 0
# Node ID 54eba3833e34be5041640c0dd6693526e5c2bd88
# Parent  755d7f8907c662dbe984fc6664548812f9ba5f6b
[gaim-migrate @ 9699]
Ambrose Li fixed up our quoted-printable decoding

committer: Tailor Script <tailor@pidgin.im>

diff -r 755d7f8907c6 -r 54eba3833e34 src/util.c
--- a/src/util.c	Fri May 14 05:04:28 2004 +0000
+++ b/src/util.c	Fri May 14 05:51:38 2004 +0000
@@ -137,6 +137,9 @@
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
 	"0123456789+/";
 
+static const char xdigits[] =
+	"0123456789abcdef";
+
 unsigned char *
 gaim_base64_encode(const unsigned char *in, size_t inlen)
 {
@@ -244,23 +247,37 @@
 }
 
 /**************************************************************************
- * Quoted Printable Functions
+ * Quoted Printable Functions (see RFC 1341)
  **************************************************************************/
 void
 gaim_quotedp_decode(const char *str, char **ret_str, int *ret_len)
 {
 	char *n, *new;
 	const char *end, *p;
-	int i;
 
 	n = new = g_malloc(strlen (str) + 1);
 	end = str + strlen(str);
 
 	for (p = str; p < end; p++, n++) {
 		if (*p == '=') {
-			sscanf(p + 1, "%2x\n", &i);
-			*n = i;
-			p += 2;
+			if (p[1] == '\r' && p[2] == '\n') { /* 5.1 #5 */
+				n -= 1;
+				p += 2;
+			} else if (p[1] == '\n') { /* fuzzy case for 5.1 #5 */
+				n -= 1;
+				p += 1;
+			} else if (p[1] && p[2]) {
+				char *nibble1 = strchr(xdigits, tolower(p[1]));
+				char *nibble2 = strchr(xdigits, tolower(p[2]));
+				if (nibble1 && nibble2) { /* 5.1 #1 */
+					*n = ((nibble1 - xdigits) << 4) | (nibble2 - xdigits);
+					p += 2;
+				} else { /* This should never happen */
+					*n = *p;
+				}
+			} else { /* This should never happen */
+				*n = *p;
+			}
 		}
 		else if (*p == '_')
 			*n = ' ';