Replaced snprintf() to convert an int with m_name().

[nmh] / uip / mhshowsbr.c

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 1e3a4ba465c3de24d78396bc60a04392eb40eeeb..6f8a978f4a8499af145e27cee484749dd35d3cc0 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -15,6 +15,8 @@
 #include <h/mhparse.h>
 #include <h/fmt_scan.h>
 #include <h/utils.h>
+#include "mhshowsbr.h"
+#include "../sbr/m_mktemp.h"
 #ifdef HAVE_ICONV
 #   include <iconv.h>
 #endif /* ! HAVE_ICONV */
@@ -96,7 +98,7 @@ static struct param_comp_list *dispo_pc_list = NULL;
  */
 
 void
-show_all_messages (CT *cts, int concatsw, int textonly, int inlineonly)
+show_all_messages(CT *cts, int concat, int textonly, int inlineonly)
 {
     CT ct, *ctp;
     struct format *hfmt, *mfmt;
@@ -127,7 +129,7 @@ show_all_messages (CT *cts, int concatsw, int textonly, int inlineonly)
        if (type_ok (ct, 1)) {
            if (headersw) output_header(ct, hfmt);
 
-           show_single_message (ct, formsw, concatsw, textonly, inlineonly,
+           show_single_message (ct, formsw, concat, textonly, inlineonly,
                                 mfmt);
        }
     }
@@ -342,7 +344,7 @@ show_content_aux (CT ct, int alternate, char *cp, char *cracked, struct format *
 {
     int fd;
     int xstdin = 0, xlist = 0;
-    char *file = NULL, buffer[BUFSIZ];
+    char *file = NULL, buffer[NMH_BUFSIZ];
 
     if (!ct->c_ceopenfnx) {
        if (!alternate)
@@ -497,11 +499,15 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
 
        default: {
            int status;
+            char *display_prog = vecp > 2  &&  vec[2][0] != '\0'
+                /* Copy the real display program name.  This relies on the
+                   specific construction of vec[] by argsplit(). */
+                ?  vec[2]
+                :  NULL;
 
-           arglist_free(file, vec);
-
-           pidcheck ((status = pidXwait (child_id, NULL)));
+            pidcheck ((status = pidXwait (child_id, display_prog)));
 
+            arglist_free(file, vec);
            if (fd != NOTOK)
                (*ct->c_ceclosefnx) (ct);
            return (alternate ? OK : status);