X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/bc4927948a1b01bf2ae8b952dfd2639c1f929f00..1ca8f21e0edfe448b71ac86de1b0cd987547a002:/sbr/encode_rfc2047.c diff --git a/sbr/encode_rfc2047.c b/sbr/encode_rfc2047.c index d1ccd2e9..e7ccd308 100644 --- 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 @@ -10,6 +9,8 @@ #include #include #include +#include "base64.h" +#include "unquote.h" /* * List of headers that contain addresses and as a result require special @@ -107,7 +108,7 @@ encode_rfc2047(const char *name, char **value, int encoding, 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; } @@ -146,7 +147,7 @@ encode_rfc2047(const char *name, char **value, int encoding, eightbitcount + qpspecialcount, 0); default: - advise(NULL, "Internal error: unknown RFC-2047 encoding type"); + inform("Internal error: unknown RFC-2047 encoding type"); return 1; } } @@ -159,7 +160,7 @@ static int field_encode_quoted(const char *name, char **value, const char *charset, int ascii, int encoded, int phraserules) { - int prefixlen = name ? strlen(name) + 2: 0, outlen = 0, column, newline = 1; + int prefixlen = name ? strlen(name) + 2: 0, outlen = 0, column; int charsetlen = strlen(charset), utf8; char *output = NULL, *p, *q = NULL; @@ -174,6 +175,7 @@ field_encode_quoted(const char *name, char **value, const char *charset, utf8 = strcasecmp(charset, "UTF-8") == 0; + bool newline = true; while (*p != '\0') { /* * Start a new line, if it's time @@ -224,7 +226,7 @@ field_encode_quoted(const char *name, char **value, const char *charset, tokenlen = snprintf(q, outlen - (q - output), "=?%s?Q?", charset); q += tokenlen; column = prefixlen + tokenlen; - newline = 0; + newline = false; } /* @@ -265,7 +267,7 @@ field_encode_quoted(const char *name, char **value, const char *charset, continue; if (column >= ENCODELINELIMIT - 2) { - newline = 1; + newline = true; } else if (utf8) { /* * Okay, this is a bit weird, but to explain a bit more ... @@ -281,7 +283,7 @@ field_encode_quoted(const char *name, char **value, const char *charset, * allow for the encoded output. */ if (column + (utf8len(p) * 3) > ENCODELINELIMIT - 2) { - newline = 1; + newline = true; } } } @@ -289,7 +291,7 @@ field_encode_quoted(const char *name, char **value, const char *charset, if (q == NULL) { /* This should never happen, but just in case. Found by clang static analyzer. */ - admonish (NULL, "null output encoding for %s", *value); + inform("null output encoding for %s, continuing...", *value); return 1; } *q++ = '?'; @@ -381,7 +383,7 @@ field_encode_base64(const char *name, char **value, const char *charset) 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; } @@ -405,7 +407,7 @@ field_encode_base64(const char *name, char **value, const char *charset) 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; } @@ -413,7 +415,7 @@ field_encode_base64(const char *name, char **value, const char *charset) 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; } @@ -460,7 +462,7 @@ field_encode_base64(const char *name, char **value, const char *charset) 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; } @@ -574,7 +576,7 @@ field_encode_address(const char *name, char **value, int encoding, for (groupflag = 0; (mp = getname(*value)); ) { if ((mn = getm(mp, NULL, 0, errbuf, sizeof(errbuf))) == NULL) { - advise(NULL, "%s: %s", errbuf, mp); + inform("%s: %s", errbuf, mp); errflag++; continue; } @@ -632,7 +634,7 @@ field_encode_address(const char *name, char **value, int encoding, break; default: - advise(NULL, "Internal error: unknown RFC-2047 encoding type"); + inform("Internal error: unknown RFC-2047 encoding type"); errflag++; goto out; } @@ -658,7 +660,7 @@ field_encode_address(const char *name, char **value, int encoding, } 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; @@ -695,7 +697,7 @@ field_encode_address(const char *name, char **value, int encoding, break; default: - advise(NULL, "Internal error: unknown RFC-2047 encoding type"); + inform("Internal error: unknown RFC-2047 encoding type"); errflag++; goto out; } @@ -737,7 +739,7 @@ do_reformat: if (groupflag && ! mn->m_ingrp) { output = add(";", output); - column += 1; + column++; } groupflag = mn->m_ingrp; @@ -798,8 +800,8 @@ do_reformat: output = NULL; out: - mh_xfree(tmpbuf); - mh_xfree(output); + free(tmpbuf); + free(output); return errflag > 0; }