Added filename completion to bash_completion_nmh.

[nmh] / uip / mhshowsbr.c

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 57ea78820069096febd67b193a5a4b76aa21a2b9..7298f5b0435e93283f8ee7bd8780b4bbad9f8403 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++] = getcpy(form);
-    vec[vecp++] = getcpy("-nobody");
+    vec[vecp++] = mh_xstrdup("-form");
+    vec[vecp++] = mh_xstrdup(form);
+    vec[vecp++] = mh_xstrdup("-nobody");
     vec[vecp++] = getcpy(ct->c_file);
 
     /*
@@ -216,10 +216,10 @@ 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++] = getcpy(progsw);
+       vec[vecp++] = mh_xstrdup("-moreproc");
+       vec[vecp++] = mh_xstrdup(progsw);
     }
     vec[vecp] = NULL;
 
@@ -461,7 +461,7 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
 
        if (strcmp(invo_name, "mhshow") == 0 && ct->c_type == CT_TEXT &&
            ct->c_subtype == TEXT_PLAIN && lastchar != '\n') {
-           putc('\n', stdout);
+           putchar('\n');
        }
 
        fflush(stdout);
@@ -539,7 +539,7 @@ show_text (CT ct, int alternate, int concatsw, struct format *fmt)
        } else
            snprintf (buffer, sizeof(buffer), "%%l%s %%F", progsw ? progsw :
                      moreproc && *moreproc ? moreproc : DEFAULT_PAGER);
-       cp = (ct->c_showproc = add (buffer, NULL));
+       cp = (ct->c_showproc = mh_xstrdup(buffer));
        return show_content_aux (ct, alternate, cp, NULL, fmt);
     }
 
@@ -747,7 +747,7 @@ show_message_rfc822 (CT ct, int alternate, struct format *fmt)
 
     /* default method for message/rfc822 */
     if (ct->c_subtype == MESSAGE_RFC822) {
-       cp = (ct->c_showproc = add ("%pshow -file %F", NULL));
+       cp = (ct->c_showproc = mh_xstrdup("%pshow -file %F"));
        return show_content_aux (ct, alternate, cp, NULL, fmt);
     }
 
@@ -1094,7 +1094,7 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) {
             adios (NULL, "unable to create temporary file in %s",
                    get_temp_dir());
         }
-        dest = add (tempfile, NULL);
+        dest = mh_xstrdup(tempfile);
 
         if (ct->c_cefile.ce_file) {
             file = &ct->c_cefile.ce_file;
@@ -1360,14 +1360,14 @@ compile_marker(char *form)
        } else if (strncasecmp(comp->c_name, "ctype-", 6) == 0 &&
                   strlen(comp->c_name) > 6) {
            NEW(pc_entry);
-           pc_entry->param = getcpy(comp->c_name + 6);
+           pc_entry->param = mh_xstrdup(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) {
            NEW(pc_entry);
-           pc_entry->param = getcpy(comp->c_name + 7);
+           pc_entry->param = mh_xstrdup(comp->c_name + 7);
            pc_entry->comp = comp;
            pc_entry->next = dispo_pc_list;
            dispo_pc_list = pc_entry;
@@ -1432,15 +1432,15 @@ output_marker(CT ct, struct format *fmt, int hidden)
     }
 
     if (part_comp && ct->c_partno) {
-       part_comp->c_text = getcpy(ct->c_partno);
+       part_comp->c_text = mh_xstrdup(ct->c_partno);
     }
 
     if (description_comp && ct->c_descr) {
-       description_comp->c_text = getcpy(ct->c_descr);
+       description_comp->c_text = mh_xstrdup(ct->c_descr);
     }
 
     if (dispo_comp && ct->c_dispo_type) {
-       dispo_comp->c_text = getcpy(ct->c_dispo_type);
+       dispo_comp->c_text = mh_xstrdup(ct->c_dispo_type);
     }
 
     for (pcentry = ctype_pc_list; pcentry != NULL; pcentry = pcentry->next) {