X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0b06986039976e3c786a3fbaeec6ced475734002..a1349849b7d37f6ffd264005c1f945d64bb35858:/sbr/encode_rfc2047.c

diff --git a/sbr/encode_rfc2047.c b/sbr/encode_rfc2047.c
index 54a1e088..953f6e5c 100644
--- a/sbr/encode_rfc2047.c
+++ b/sbr/encode_rfc2047.c
@@ -125,14 +125,14 @@ encode_rfc2047(const char *name, char **value, int encoding,
      * On the encoding we choose, and the specifics of encoding:
      *
      * - If a specified encoding is passed in, we use that.
-     * - If more than 50% of the characters are high-bit, we use base64
-     *   and encode the whole field as one atom (possibly split).
-     * - Otherwise, we use quoted-printable.
+     * - Otherwise, pick which encoding is shorter.
+     *
+     * We don't quite handle continuation right here, but it should be
+     * pretty close.
      */
 
     if (encoding == CE_UNKNOWN)
-    	encoding = (eightbitcount * 10 / (asciicount + eightbitcount) > 5) ?
-						CE_BASE64 : CE_QUOTED;
+        encoding = pref_encoding(asciicount, qpspecialcount, eightbitcount);
 
     unfold_header(value, asciicount + eightbitcount);
 
@@ -161,7 +161,7 @@ field_encode_quoted(const char *name, char **value, const char *charset,
 {
     int prefixlen = name ? strlen(name) + 2: 0, outlen = 0, column, newline = 1;
     int charsetlen = strlen(charset), utf8;
-    char *output = NULL, *p, *q;
+    char *output = NULL, *p, *q = NULL;
 
     /*
      * Right now we just encode the whole thing.  Maybe later on we'll
@@ -313,7 +313,7 @@ field_encode_base64(const char *name, char **value, const char *charset)
 {
     int prefixlen = name ? strlen(name) + 2 : 0, charsetlen = strlen(charset);
     int outlen = 0, numencode, curlen;
-    char *output = NULL, *p = *value, *q = NULL, *linestart;
+    char *output = NULL, *p = *value, *q = NULL, *linestart = NULL;
 
     /*
      * Skip over any leading white space.
@@ -517,8 +517,8 @@ unfold_header(char **value, int len)
 	     * This has the side effect of stripping off the final newline
 	     * for the header; we put it back in the encoding routine.
 	     */
-	    while (is_fws(*q++))
-	    	;
+	    while (is_fws(*q))
+	    	q++;
 	    if (*q == '\0')
 	    	break;
 
@@ -545,7 +545,6 @@ field_encode_address(const char *name, char **value, int encoding,
 {
     int prefixlen = strlen(name) + 2, column = prefixlen, groupflag;
     int asciichars, specialchars, eightbitchars, reformat = 0, errflag = 0;
-    int retval;
     size_t len;
     char *mp, *cp = NULL, *output = NULL;
     char *tmpbuf = NULL;
@@ -610,13 +609,18 @@ field_encode_address(const char *name, char **value, int encoding,
 	    switch (encoding) {
 
 	    case CE_BASE64:
-	    	retval = field_encode_base64(NULL, &mn->m_pers, charset);
+	    	if (field_encode_base64(NULL, &mn->m_pers, charset)) {
+		    errflag++;
+		    goto out;
+		}
 		break;
 
 	    case CE_QUOTED:
-	    	retval = field_encode_quoted(NULL, &mn->m_pers, charset,
-					     asciichars,
-					     eightbitchars + specialchars, 1);
+	    	if (field_encode_quoted(NULL, &mn->m_pers, charset, asciichars,
+					eightbitchars + specialchars, 1)) {
+		    errflag++;
+		    goto out;
+		}
 		break;
 
 	    default:
@@ -641,9 +645,7 @@ field_encode_address(const char *name, char **value, int encoding,
 	if (! mn->m_note)
 	    goto do_reformat;
 
-	len = strlen(mn->m_note);
-
-	if ((len = strlen(mn->m_pers)) + 1 > tmpbufsize) {
+	if ((len = strlen(mn->m_note)) + 1 > tmpbufsize) {
 	    tmpbuf = mh_xrealloc(tmpbuf, tmpbufsize = len + 1);
 	}
 
@@ -670,13 +672,18 @@ field_encode_address(const char *name, char **value, int encoding,
 	    switch (encoding) {
 
 	    case CE_BASE64:
-	    	retval = field_encode_base64(NULL, &tmpbuf, charset);
+	    	if (field_encode_base64(NULL, &tmpbuf, charset)) {
+		    errflag++;
+		    goto out;
+		}
 		break;
 
 	    case CE_QUOTED:
-	    	retval = field_encode_quoted(NULL, &tmpbuf, charset,
-					     asciichars,
-					     eightbitchars + specialchars, 1);
+	    	if (field_encode_quoted(NULL, &tmpbuf, charset, asciichars,
+					eightbitchars + specialchars, 1)) {
+		    errflag++;
+		    goto out;
+		}
 		break;
 
 	    default:
@@ -721,8 +728,8 @@ do_reformat:
 	 */
 
 	if (groupflag && ! mn->m_ingrp) {
-	    output = add("; ", output);
-	    column += 2;
+	    output = add(";", output);
+	    column += 1;
 	}
 
 	groupflag = mn->m_ingrp;