Remove WHATNOW #ifdefs; that code was obsolete a long time ago.

[nmh] / sbr / encode_rfc2047.c

diff --git a/sbr/encode_rfc2047.c b/sbr/encode_rfc2047.c
index 3c4f45e57220cfcb000dff948ed734744e285a00..537a275e345c14e8535d50ce2b1fbbeffca66f75 100644 (file)
--- 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.
      * 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)
      */
 
     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);
 
 
     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;
 {
     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
 
     /*
      * Right now we just encode the whole thing.  Maybe later on we'll


@@ -286,10 +286,13 @@ field_encode_quoted(const char *name, char **value, const char *charset,
        }
     }
 
        }
     }
 

-    strcat(q, "?=");
+    *q++ = '?';
+    *q++ = '=';

 
     if (prefixlen)
 
     if (prefixlen)

-       strcat(q, "\n");
+       *q++ = '\n';
+
+    *q = '\0';

 
     free(*value);
 
 
     free(*value);
 


@@ -310,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;
 {
     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.
 
     /*
      * Skip over any leading white space.


@@ -514,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.
             */
             * 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;
 
            if (*q == '\0')
                break;
 


@@ -542,12 +545,12 @@ 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 prefixlen = strlen(name) + 2, column = prefixlen, groupflag;
     int asciichars, specialchars, eightbitchars, reformat = 0, errflag = 0;

-    int retval;

     size_t len;
     size_t len;

-    char *mp, *output = NULL;
+    char *mp, *cp = NULL, *output = NULL;

     char *tmpbuf = NULL;
     size_t tmpbufsize = 0;
     struct mailname *mn;
     char *tmpbuf = NULL;
     size_t tmpbufsize = 0;
     struct mailname *mn;

+    char errbuf[BUFSIZ];

 
     /*
      * Because these are addresses, we need to handle them individually.
 
     /*
      * Because these are addresses, we need to handle them individually.


@@ -564,11 +567,14 @@ field_encode_address(const char *name, char **value, int encoding,
     output = add(" ", output);
 
     for (groupflag = 0; (mp = getname(*value)); ) {
     output = add(" ", output);
 
     for (groupflag = 0; (mp = getname(*value)); ) {

-       if ((mn = getm(mp, NULL, 0, AD_HOST, NULL)) == NULL) {
+       if ((mn = getm(mp, NULL, 0, errbuf, sizeof(errbuf))) == NULL) {
+           advise(mp, "%s", errbuf);

            errflag++;
            continue;
        }
 
            errflag++;
            continue;
        }
 

+       reformat = 0;
+

        /*
         * We only care if the phrase (m_pers) or any trailing comment
         * (m_note) have 8-bit characters.  If doing q-p, we also need
        /*
         * We only care if the phrase (m_pers) or any trailing comment
         * (m_note) have 8-bit characters.  If doing q-p, we also need


@@ -605,13 +611,18 @@ field_encode_address(const char *name, char **value, int encoding,
            switch (encoding) {
 
            case CE_BASE64:
            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:
                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:
                break;
 
            default:


@@ -636,9 +647,7 @@ field_encode_address(const char *name, char **value, int encoding,
        if (! mn->m_note)
            goto do_reformat;
 
        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);
        }
 
            tmpbuf = mh_xrealloc(tmpbuf, tmpbufsize = len + 1);
        }
 


@@ -665,13 +674,18 @@ field_encode_address(const char *name, char **value, int encoding,
            switch (encoding) {
 
            case CE_BASE64:
            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:
                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:
                break;
 
            default:


@@ -681,15 +695,108 @@ field_encode_address(const char *name, char **value, int encoding,
            }
 
            reformat++;
            }
 
            reformat++;

+
+           /*
+            * Make sure the size of tmpbuf is correct (it always gets
+            * reallocated in the above functions).
+            */
+
+           tmpbufsize = strlen(tmpbuf) + 1;
+
+           /*
+            * Put the note field back surrounded by parenthesis.
+            */
+
+           mn->m_note = mh_xrealloc(mn->m_note, tmpbufsize + 2);
+
+           snprintf(mn->m_note, tmpbufsize + 2, "(%s)", tmpbuf);
+       }
+
+do_reformat:
+
+       /*
+        * So, some explanation is in order.
+        *
+        * We know we need to rewrite at least one address in the header,
+        * otherwise we wouldn't be here.  If we had to reformat this
+        * particular address, then run it through adrformat().  Otherwise
+        * we can use m_text directly.
+        */
+
+       /*
+        * If we were in a group but are no longer, make sure we add a
+        * semicolon (which needs to be FIRST, as it needs to be at the end
+        * of the last address).
+        */
+
+       if (groupflag && ! mn->m_ingrp) {
+           output = add(";", output);
+           column += 1;

        }
 
        }
 

+       groupflag = mn->m_ingrp;
+
+       if (mn->m_gname) {
+           cp = add(mn->m_gname, NULL);
+       }

 
 

+       if (reformat) {
+           cp = add(adrformat(mn), cp);
+       } else {
+           cp = add(mn->m_text, cp);
+       }
+
+       len = strlen(cp);
+
+       /*
+        * If we're not at the beginning of the line, add a command and
+        * either a space or a newline.
+        */
+
+       if (column != prefixlen) {
+           if (len + column + 2 > OUTPUTLINELEN) {
+
+               if ((size_t) (prefixlen + 3) < tmpbufsize)
+                   tmpbuf = mh_xrealloc(tmpbuf, tmpbufsize = prefixlen + 3);
+
+               snprintf(tmpbuf, tmpbufsize, ",\n%*s", column = prefixlen, "");
+               output = add(tmpbuf, output);
+           } else {
+               output = add(", ", output);
+               column += 2;
+           }
+       }
+
+       /*
+        * Finally add the address
+        */
+
+       output = add(cp, output);
+       column += len;
+       free(cp);
+       cp = NULL;
+    }
+
+    /*
+     * Just in case we're at the end of a list
+     */
+
+    if (groupflag) {
+       output = add(";", output);

     }
 
     }
 

+    output = add("\n", output);
+
+    free(*value);
+    *value = output;
+    output = NULL;
+

 out:
 
     if (tmpbuf)
        free(tmpbuf);
 out:
 
     if (tmpbuf)
        free(tmpbuf);

+    if (output)
+       free(output);

 
     return errflag > 0;
 }
 
     return errflag > 0;
 }


@@ -709,7 +816,12 @@ scanstring(const char *string, int *asciilen, int *eightbitchars,
     for (; *string != '\0'; string++) {
        if ((isascii((unsigned char) *string))) {
            (*asciilen)++;
     for (; *string != '\0'; string++) {
        if ((isascii((unsigned char) *string))) {
            (*asciilen)++;

-           if (!qphrasevalid((unsigned char) *string))
+           /*
+            * So, a space is not a valid phrase character, but we're counting
+            * an exception here, because in q-p a space can be directly
+            * encoded as an underscore.
+            */
+           if (!qphrasevalid((unsigned char) *string) && *string != ' ')

                (*specialchars)++;
        } else {
            (*eightbitchars)++;
                (*specialchars)++;
        } else {
            (*eightbitchars)++;