Rename recently added HasSuffixC() to has_suffix_c().

[nmh] / uip / mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index ab9dc6ccc0eb4134fe4c94c9eb106e8234c274f0..5607be1786ddf50ee5b7dfeaea0c81b659fde5ef 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -204,8 +204,8 @@ build_mime (char *infile, int autobuild, int dist, int directives,
            }
 
            /* get copies of the buffers */
-           np = add (name, NULL);
-           vp = add (buf, NULL);
+           np = mh_xstrdup(name);
+           vp = mh_xstrdup(buf);
 
            /* if necessary, get rest of field */
            while (state == FLDPLUS) {
@@ -377,7 +377,7 @@ finish_field:
      */
 
     if (! dist) {
-       np = add (VRSN_FIELD, NULL);
+       np = mh_xstrdup(VRSN_FIELD);
        vp = concat (" ", VRSN_VALUE, "\n", NULL);
        add_header (ct, np, vp);
     }
@@ -612,23 +612,26 @@ static char *
 fgetstr (char *s, int n, FILE *stream)
 {
     char *cp, *ep;
-    int o_n = n;
 
+    ep = s + n;
     while(1) {
-       for (ep = (cp = s) + o_n; cp < ep; ) {
-           int i;
+       for (cp = s; cp < ep;) {
+           int len;
 
            if (!fgets (cp, n, stream))
-               return (cp != s ? s : NULL);
+                return cp == s ? NULL : s; /* "\\\nEOF" ignored. */
 
-           if (cp == s && *cp != '#')
-               return s;
+           if (! do_direct()  ||  (cp == s && *cp != '#'))
+               return s; /* Plaintext line. */
 
-           cp += (i = strlen (cp)) - 1;
-           if (i <= 1 || *cp-- != '\n' || *cp != '\\')
+           len = strlen(cp);
+           if (len <= 1)
+               break; /* Can't contain "\\\n". */
+           cp += len - 1; /* Just before NUL. */
+           if (*cp-- != '\n' || *cp != '\\')
                break;
-           *cp = '\0';
-           n -= (i - 2);
+           *cp = '\0'; /* Erase the trailing "\\\n". */
+           n -= (len - 2);
        }
 
        if (strcmp(s, "#on\n") == 0) {
@@ -638,11 +641,9 @@ fgetstr (char *s, int n, FILE *stream)
        } else if (strcmp(s, "#pop\n") == 0) {
            directive_pop();
        } else {
-           break;
+           return s;
        }
     }
-
-    return s;
 }
 
 
@@ -703,7 +704,7 @@ user_content (FILE *in, char *buf, CT *ctp, const char *infilename)
        }
 
        /* use a temp file to collect the plain text lines */
-       ce->ce_file = add (cp, NULL);
+       ce->ce_file = mh_xstrdup(cp);
        ce->ce_unlink = 1;
 
        if (do_direct() && (buf[0] == '#' && buf[1] == '<')) {
@@ -930,7 +931,7 @@ use_forw:
                    continue;
                if (!*cp)
                    adios (NULL, "empty pipe command for #%s directive", ci->ci_type);
-               cp = add (cp, NULL);
+               cp = mh_xstrdup(cp);
                free (ci->ci_magic);
                ci->ci_magic = cp;
            } else {
@@ -954,7 +955,7 @@ use_forw:
            content_error (NULL, ct, "don't know how to compose content");
            done (1);
        }
-       ci->ci_magic = add (cp, NULL);
+       ci->ci_magic = mh_xstrdup(cp);
        return OK;
     }
 
@@ -1037,7 +1038,7 @@ use_forw:
                    p->c_subtype = MESSAGE_RFC822;
 
                    snprintf (buffer, sizeof(buffer), "%s/%d", mp->foldpath, msgnum);
-                   pe->ce_file = add (buffer, NULL);
+                   pe->ce_file = mh_xstrdup(buffer);
                    if (listsw && stat (pe->ce_file, &st) != NOTOK)
                        p->c_end = (long) st.st_size;
 
@@ -1056,7 +1057,7 @@ use_forw:
 
            msgnum = mp->lowsel;
            snprintf (buffer, sizeof(buffer), "%s/%d", mp->foldpath, msgnum);
-           ce->ce_file = add (buffer, NULL);
+           ce->ce_file = mh_xstrdup(buffer);
            if (listsw && stat (ce->ce_file, &st) != NOTOK)
                ct->c_end = (long) st.st_size;
        }
@@ -1185,7 +1186,7 @@ compose_content (CT ct, int verbose)
            CT p = part->mp_part;
 
            sprintf (pp, "%d", partnum);
-           p->c_partno = add (partnam, NULL);
+           p->c_partno = mh_xstrdup(partnam);
            if (compose_content (p, verbose) == NOTOK)
                return NOTOK;
        }
@@ -1251,7 +1252,7 @@ compose_content (CT ct, int verbose)
                adios("mhbuildsbr", "unable to create temporary file in %s",
                      get_temp_dir());
            }
-           ce->ce_file = add (tfile, NULL);
+           ce->ce_file = mh_xstrdup(tfile);
            ce->ce_unlink = 1;
 
            xstdout = 0;
@@ -1678,7 +1679,7 @@ build_headers (CT ct, int header_encoding)
     /*
      * output the content type and subtype
      */
-    np = add (TYPE_FIELD, NULL);
+    np = mh_xstrdup(TYPE_FIELD);
     vp = concat (" ", ci->ci_type, "/", ci->ci_subtype, NULL);
 
     /* keep track of length of line */
@@ -1727,7 +1728,7 @@ build_headers (CT ct, int header_encoding)
      * output the Content-ID, unless disabled by -nocontentid
      */
     if (contentidsw && ct->c_id) {
-       np = add (ID_FIELD, NULL);
+       np = mh_xstrdup(ID_FIELD);
        vp = concat (" ", ct->c_id, NULL);
        add_header (ct, np, vp);
     }
@@ -1735,7 +1736,7 @@ build_headers (CT ct, int header_encoding)
      * output the Content-Description
      */
     if (ct->c_descr) {
-       np = add (DESCR_FIELD, NULL);
+       np = mh_xstrdup(DESCR_FIELD);
        vp = concat (" ", ct->c_descr, NULL);
        if (header_encoding != CE_8BIT) {
            if (encode_rfc2047(DESCR_FIELD, &vp, header_encoding, NULL)) {
@@ -1750,7 +1751,7 @@ build_headers (CT ct, int header_encoding)
      * set, then we need to build it.
      */
     if (ct->c_dispo) {
-       np = add (DISPO_FIELD, NULL);
+       np = mh_xstrdup(DISPO_FIELD);
        vp = concat (" ", ct->c_dispo, NULL);
        add_header (ct, np, vp);
     } else if (ct->c_dispo_type) {
@@ -1759,8 +1760,7 @@ build_headers (CT ct, int header_encoding)
        np = output_params(len, ct->c_dispo_first, NULL, 0);
        vp = add(np, vp);
        vp = add("\n", vp);
-       if (np)
-           free(np);
+        mh_xfree(np);
        add_header (ct, mh_xstrdup(DISPO_FIELD), vp);
     }
 
@@ -1777,7 +1777,7 @@ skip_headers:
      * output the Content-MD5
      */
     if (checksw) {
-       np = add (MD5_FIELD, NULL);
+       np = mh_xstrdup(MD5_FIELD);
        vp = calculate_digest (ct, (ct->c_encoding == CE_QUOTED) ? 1 : 0);
        add_header (ct, np, vp);
     }
@@ -1796,7 +1796,7 @@ skip_headers:
        break;
 
     case CE_8BIT:
-       np = add (ENCODING_FIELD, NULL);
+       np = mh_xstrdup(ENCODING_FIELD);
        vp = concat (" ", "8bit", "\n", NULL);
        add_header (ct, np, vp);
        break;
@@ -1805,7 +1805,7 @@ skip_headers:
        if (ct->c_type == CT_MESSAGE || ct->c_type == CT_MULTIPART)
            adios (NULL, "internal error, invalid encoding");
 
-       np = add (ENCODING_FIELD, NULL);
+       np = mh_xstrdup(ENCODING_FIELD);
        vp = concat (" ", "quoted-printable", "\n", NULL);
        add_header (ct, np, vp);
        break;
@@ -1814,7 +1814,7 @@ skip_headers:
        if (ct->c_type == CT_MESSAGE || ct->c_type == CT_MULTIPART)
            adios (NULL, "internal error, invalid encoding");
 
-       np = add (ENCODING_FIELD, NULL);
+       np = mh_xstrdup(ENCODING_FIELD);
        vp = concat (" ", "base64", "\n", NULL);
        add_header (ct, np, vp);
        break;
@@ -1823,7 +1823,7 @@ skip_headers:
        if (ct->c_type == CT_MESSAGE)
            adios (NULL, "internal error, invalid encoding");
 
-       np = add (ENCODING_FIELD, NULL);
+       np = mh_xstrdup(ENCODING_FIELD);
        vp = concat (" ", "binary", "\n", NULL);
        add_header (ct, np, vp);
        break;
@@ -2033,8 +2033,7 @@ setup_attach_content(CT ct, char *filename)
 
     for (pm = ct->c_ctinfo.ci_first_pm; pm; pm = pm->pm_next) {
        if (strcasecmp(pm->pm_name, "name") == 0) {
-           if (pm->pm_value)
-               free(pm->pm_value);
+            mh_xfree(pm->pm_value);
            pm->pm_value = mh_xstrdup(simplename);
            break;
        }