X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8a14191c0a0ad15bb8f35b49748c75c1e0a8c2f4..2b7a0f47ea3ecea7b50c3052e854eae0d306da80:/sbr/encode_rfc2047.c?ds=inline

diff --git a/sbr/encode_rfc2047.c b/sbr/encode_rfc2047.c
index d964cbde..823fd824 100644
--- a/sbr/encode_rfc2047.c
+++ b/sbr/encode_rfc2047.c
@@ -1,15 +1,18 @@
-/*
- * 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
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/mhparse.h>
-#include <h/addrsbr.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "check_charset.h"
+#include "error.h"
+#include "h/mhparse.h"
+#include "h/addrsbr.h"
+#include "h/utils.h"
+#include "base64.h"
+#include "unquote.h"
 
 /*
  * List of headers that contain addresses and as a result require special
@@ -159,7 +162,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 +177,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 +228,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 +269,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 +285,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 +293,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++ = '?';
@@ -550,7 +554,11 @@ field_encode_address(const char *name, char **value, int encoding,
 		     const char *charset)
 {
     int prefixlen = strlen(name) + 2, column = prefixlen, groupflag;
-    int asciichars, specialchars, eightbitchars, reformat = 0, errflag = 0;
+    int asciichars;
+    int specialchars;
+    int eightbitchars;
+    bool reformat = false;
+    bool errflag = false;
     size_t len;
     char *mp, *cp = NULL, *output = NULL;
     char *tmpbuf = NULL;
@@ -575,11 +583,11 @@ 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) {
 	    inform("%s: %s", errbuf, mp);
-	    errflag++;
+	    errflag = true;
 	    continue;
 	}
 
-	reformat = 0;
+	reformat = false;
 
 	/*
 	 * We only care if the phrase (m_pers) or any trailing comment
@@ -618,7 +626,7 @@ field_encode_address(const char *name, char **value, int encoding,
 
 	    case CE_BASE64:
 	    	if (field_encode_base64(NULL, &mn->m_pers, charset)) {
-		    errflag++;
+		    errflag = true;
 		    goto out;
 		}
 		break;
@@ -626,18 +634,18 @@ field_encode_address(const char *name, char **value, int encoding,
 	    case CE_QUOTED:
 	    	if (field_encode_quoted(NULL, &mn->m_pers, charset, asciichars,
 					eightbitchars + specialchars, 1)) {
-		    errflag++;
+		    errflag = true;
 		    goto out;
 		}
 		break;
 
 	    default:
 		inform("Internal error: unknown RFC-2047 encoding type");
-		errflag++;
+		errflag = true;
 		goto out;
 	    }
 
-	    reformat++;
+	    reformat = true;
 	}
 
 	check_note:
@@ -660,7 +668,7 @@ field_encode_address(const char *name, char **value, int encoding,
 	if (mn->m_note[0] != '(' || mn->m_note[len - 1] != ')') {
 	    inform("Internal error: Invalid note field \"%s\"",
 	    	   mn->m_note);
-	    errflag++;
+	    errflag = true;
 	    goto out;
 	}
 
@@ -681,7 +689,7 @@ field_encode_address(const char *name, char **value, int encoding,
 
 	    case CE_BASE64:
 	    	if (field_encode_base64(NULL, &tmpbuf, charset)) {
-		    errflag++;
+		    errflag = true;
 		    goto out;
 		}
 		break;
@@ -689,18 +697,18 @@ field_encode_address(const char *name, char **value, int encoding,
 	    case CE_QUOTED:
 	    	if (field_encode_quoted(NULL, &tmpbuf, charset, asciichars,
 					eightbitchars + specialchars, 1)) {
-		    errflag++;
+		    errflag = true;
 		    goto out;
 		}
 		break;
 
 	    default:
 		inform("Internal error: unknown RFC-2047 encoding type");
-		errflag++;
+		errflag = true;
 		goto out;
 	    }
 
-	    reformat++;
+	    reformat = true;
 
 	    /*
 	     * Make sure the size of tmpbuf is correct (it always gets
@@ -737,7 +745,7 @@ do_reformat:
 
 	if (groupflag && ! mn->m_ingrp) {
 	    output = add(";", output);
-	    column += 1;
+	    column++;
 	}
 
 	groupflag = mn->m_ingrp;
@@ -798,10 +806,10 @@ do_reformat:
     output = NULL;
 
 out:
-    mh_xfree(tmpbuf);
-    mh_xfree(output);
+    free(tmpbuf);
+    free(output);
 
-    return errflag > 0;
+    return errflag;
 }
 
 /*