mhbuildsbr.c: Flip logic, moving goto to then-block; no need for else.

[nmh] / sbr / encode_rfc2047.c

diff --git a/sbr/encode_rfc2047.c b/sbr/encode_rfc2047.c
index ab3987d6ac86dd5be6ac2e940ea4ae74c8870dae..75b5808f26313bfee356889c074522ce1c655349 100644 (file)
--- a/sbr/encode_rfc2047.c
+++ b/sbr/encode_rfc2047.c
@@ -1,5 +1,4 @@
-/*
- * Routines to encode message headers using RFC 2047-encoding.
+/* encode_rfc2047.c -- encode message headers using RFC 2047 encoding.

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -10,6 +9,7 @@
 #include <h/mhparse.h>
 #include <h/addrsbr.h>
 #include <h/utils.h>
 #include <h/mhparse.h>
 #include <h/addrsbr.h>
 #include <h/utils.h>

+#include "unquote.h"

 
 /*
  * List of headers that contain addresses and as a result require special
 
 /*
  * List of headers that contain addresses and as a result require special


@@ -107,7 +107,7 @@ encode_rfc2047(const char *name, char **value, int encoding,
        charset = write_charset_8bit();
 
     if (strcasecmp(charset, "US-ASCII") == 0) {
        charset = write_charset_8bit();
 
     if (strcasecmp(charset, "US-ASCII") == 0) {

-       advise(NULL, "Cannot use US-ASCII with 8 bit characters in header");
+       inform("Cannot use US-ASCII with 8 bit characters in header");

        return 1;
     }
 
        return 1;
     }
 


@@ -146,7 +146,7 @@ encode_rfc2047(const char *name, char **value, int encoding,
                                   eightbitcount + qpspecialcount, 0);
 
     default:
                                   eightbitcount + qpspecialcount, 0);
 
     default:

-       advise(NULL, "Internal error: unknown RFC-2047 encoding type");
+       inform("Internal error: unknown RFC-2047 encoding type");

        return 1;
     }
 }
        return 1;
     }
 }


@@ -281,16 +281,22 @@ field_encode_quoted(const char *name, char **value, const char *charset,
             * allow for the encoded output.
             */
            if (column + (utf8len(p) * 3) > ENCODELINELIMIT - 2) {
             * allow for the encoded output.
             */
            if (column + (utf8len(p) * 3) > ENCODELINELIMIT - 2) {

-               newline = 1;
+               newline = 1;

            }
        }
     }
 
            }
        }
     }
 

+    if (q == NULL) {
+       /* This should never happen, but just in case.  Found by
+          clang static analyzer. */
+       inform("null output encoding for %s, continuing...", *value);
+       return 1;
+    }

     *q++ = '?';
     *q++ = '=';
 
     if (prefixlen)
     *q++ = '?';
     *q++ = '=';
 
     if (prefixlen)

-       *q++ = '\n';
+       *q++ = '\n';

 
     *q = '\0';
 
 
     *q = '\0';
 


@@ -313,7 +319,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.


@@ -375,7 +381,7 @@ field_encode_base64(const char *name, char **value, const char *charset)
        numencode = strbase64(ENCODELINELIMIT - (q - linestart) - 2);
 
        if (numencode <= 0) {
        numencode = strbase64(ENCODELINELIMIT - (q - linestart) - 2);
 
        if (numencode <= 0) {

-           advise(NULL, "Internal error: tried to encode %d characters "
+           inform("Internal error: tried to encode %d characters "

                   "in base64", numencode);
            return 1;
        }
                   "in base64", numencode);
            return 1;
        }


@@ -399,7 +405,7 @@ field_encode_base64(const char *name, char **value, const char *charset)
                numencode--;
 
            if (numencode == 0) {
                numencode--;
 
            if (numencode == 0) {

-               advise(NULL, "Internal error: could not find start of "
+               inform("Internal error: could not find start of "

                       "UTF-8 character when base64 encoding header");
                return 1;
            }
                       "UTF-8 character when base64 encoding header");
                return 1;
            }


@@ -407,7 +413,7 @@ field_encode_base64(const char *name, char **value, const char *charset)
 
        if (writeBase64raw((unsigned char *) p, numencode,
                           (unsigned char *) q) != OK) {
 
        if (writeBase64raw((unsigned char *) p, numencode,
                           (unsigned char *) q) != OK) {

-           advise(NULL, "Internal error: base64 encoding of header failed");
+           inform("Internal error: base64 encoding of header failed");

            return 1;
        }
 
            return 1;
        }
 


@@ -454,7 +460,7 @@ field_encode_base64(const char *name, char **value, const char *charset)
 
     if (writeBase64raw((unsigned char *) p, strlen(p),
                       (unsigned char *) q) != OK) {
 
     if (writeBase64raw((unsigned char *) p, strlen(p),
                       (unsigned char *) q) != OK) {

-       advise(NULL, "Internal error: base64 encoding of header failed");
+       inform("Internal error: base64 encoding of header failed");

        return 1;
     }
 
        return 1;
     }
 


@@ -550,6 +556,7 @@ field_encode_address(const char *name, char **value, int encoding,
     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.


@@ -566,7 +573,8 @@ 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) {
+           inform("%s: %s", errbuf, mp);

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


@@ -624,7 +632,7 @@ field_encode_address(const char *name, char **value, int encoding,
                break;
 
            default:
                break;
 
            default:

-               advise(NULL, "Internal error: unknown RFC-2047 encoding type");
+               inform("Internal error: unknown RFC-2047 encoding type");

                errflag++;
                goto out;
            }
                errflag++;
                goto out;
            }


@@ -650,7 +658,7 @@ field_encode_address(const char *name, char **value, int encoding,
        }
 
        if (mn->m_note[0] != '(' || mn->m_note[len - 1] != ')') {
        }
 
        if (mn->m_note[0] != '(' || mn->m_note[len - 1] != ')') {

-           advise(NULL, "Internal error: Invalid note field \"%s\"",
+           inform("Internal error: Invalid note field \"%s\"",

                   mn->m_note);
            errflag++;
            goto out;
                   mn->m_note);
            errflag++;
            goto out;


@@ -687,7 +695,7 @@ field_encode_address(const char *name, char **value, int encoding,
                break;
 
            default:
                break;
 
            default:

-               advise(NULL, "Internal error: unknown RFC-2047 encoding type");
+               inform("Internal error: unknown RFC-2047 encoding type");

                errflag++;
                goto out;
            }
                errflag++;
                goto out;
            }


@@ -729,13 +737,13 @@ do_reformat:
 
        if (groupflag && ! mn->m_ingrp) {
            output = add(";", output);
 
        if (groupflag && ! mn->m_ingrp) {
            output = add(";", output);

-           column += 1;
+           column++;

        }
 
        groupflag = mn->m_ingrp;
 
        if (mn->m_gname) {
        }
 
        groupflag = mn->m_ingrp;
 
        if (mn->m_gname) {

-           cp = add(mn->m_gname, NULL);
+           cp = mh_xstrdup(mn->m_gname);

        }
 
        if (reformat) {
        }
 
        if (reformat) {


@@ -790,11 +798,8 @@ do_reformat:
     output = NULL;
 
 out:
     output = NULL;
 
 out:

-
-    if (tmpbuf)
-       free(tmpbuf);
-    if (output)
-       free(output);
+    mh_xfree(tmpbuf);
+    mh_xfree(output);

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