A-ha! automake has support for tests expected to fail; use that.

[nmh] / uip / mhshowsbr.c

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 37fc86f82f2560b87aa007d318ba4cce7146754a..42484a87269df725a8d35fd496a6ecd2aa5eb5e7 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -206,9 +206,9 @@ DisplayMsgHeader (CT ct, char *form, int concatsw)
     char *file;
 
     vec = argsplit(mhlproc, &file, &vecp);
-    vec[vecp++] = getcpy("-form");
+    vec[vecp++] = mh_xstrdup("-form");
     vec[vecp++] = getcpy(form);
-    vec[vecp++] = getcpy("-nobody");
+    vec[vecp++] = mh_xstrdup("-nobody");
     vec[vecp++] = getcpy(ct->c_file);
 
     /*
@@ -216,9 +216,9 @@ DisplayMsgHeader (CT ct, char *form, int concatsw)
      * then just pass that along.
      */
     if (nomore || concatsw) {
-       vec[vecp++] = getcpy("-nomoreproc");
+       vec[vecp++] = mh_xstrdup("-nomoreproc");
     } else if (progsw) {
-       vec[vecp++] = getcpy("-moreproc");
+       vec[vecp++] = mh_xstrdup("-moreproc");
        vec[vecp++] = getcpy(progsw);
     }
     vec[vecp] = NULL;
@@ -1266,20 +1266,22 @@ convert_content_charset (CT ct, char **file) {
     /* Using current locale, see if the content needs to be converted. */
 
     /* content_charset() cannot return NULL. */
-    char *charset = content_charset (ct);
+    char *src_charset = content_charset (ct);
 
-    if (! check_charset (charset, strlen (charset))) {
+    if (! check_charset (src_charset, strlen (src_charset))) {
         int unused = 0;
 
-        char *charset = getcpy (get_charset ());
+        char *dest_charset = getcpy (get_charset ());
 
-        if (convert_charset (ct, charset, &unused) == 0) {
+        if (convert_charset (ct, dest_charset, &unused) == 0) {
             *file = ct->c_cefile.ce_file;
         } else {
             status = NOTOK;
         }
+
+        free (dest_charset);
     }
-    free (charset);
+    free (src_charset);
 #else  /* ! HAVE_ICONV */
     NMH_UNUSED (ct);
     NMH_UNUSED (file);
@@ -1357,14 +1359,14 @@ compile_marker(char *form)
            dispo_comp = comp;
        } else if (strncasecmp(comp->c_name, "ctype-", 6) == 0 &&
                   strlen(comp->c_name) > 6) {
-           pc_entry = mh_xmalloc(sizeof(*pc_entry));
+           NEW(pc_entry);
            pc_entry->param = getcpy(comp->c_name + 6);
            pc_entry->comp = comp;
            pc_entry->next = ctype_pc_list;
            ctype_pc_list = pc_entry;
        } else if (strncasecmp(comp->c_name, "cdispo-", 7) == 0 &&
                   strlen(comp->c_name) > 7) {
-           pc_entry = mh_xmalloc(sizeof(*pc_entry));
+           NEW(pc_entry);
            pc_entry->param = getcpy(comp->c_name + 7);
            pc_entry->comp = comp;
            pc_entry->next = dispo_pc_list;