-
-/*
- * mhshowsbr.c -- routines to display the contents of MIME messages
+/* mhshowsbr.c -- routines to display the contents of MIME messages
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
#include <h/mhparse.h>
#include <h/fmt_scan.h>
#include <h/utils.h>
+#include "mhmisc.h"
+#include "mhshowsbr.h"
+#include "sbr/m_mktemp.h"
#ifdef HAVE_ICONV
# include <iconv.h>
#endif /* ! HAVE_ICONV */
extern int debugsw;
-extern int npart;
-extern int ntype;
int nolist = 0;
int nomore = 0;
char *formsw = NULL;
-/* for output markerss and headers */
+/* for output markers and headers */
char *folder = NULL;
char *markerform;
char *headerform;
int headersw = -1;
-/* mhmisc.c */
-int part_ok (CT);
-int part_exact (CT);
-int type_ok (CT, int);
-void content_error (char *, CT, char *, ...);
-void flush_errors (void);
-
/*
* static prototypes
*/
*/
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;
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);
}
}
DisplayMsgHeader (CT ct, char *form, int concatsw)
{
pid_t child_id;
- int i, vecp;
+ int vecp;
char **vec;
char *file;
fflush (stdout);
- for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
- sleep (5);
-
+ child_id = fork();
switch (child_id) {
case NOTOK:
adios ("fork", "unable to");
{
int fd;
int xstdin = 0, xlist = 0;
- char *file = NULL, buffer[BUFSIZ];
+ char *file = NULL, buffer[NMH_BUFSIZ];
if (!ct->c_ceopenfnx) {
if (!alternate)
return NOTOK;
} else {
char *charset = content_charset (ct);
- admonish (NULL, "unable to convert character set%s%s from %s",
+ inform("unable to convert character set%s%s from %s, continuing...",
ct->c_partno ? " of part " : "",
- ct->c_partno ? ct->c_partno : "",
+ FENDNULL(ct->c_partno),
charset);
free (charset);
}
if (parse_display_string (ct, cp, &xstdin, &xlist, file, buffer,
sizeof(buffer) - 1, 0)) {
- admonish (NULL, "Buffer overflow constructing show command!\n");
+ inform("Buffer overflow constructing show command, continuing...");
return NOTOK;
}
int fd, int xlist, int xstdin, struct format *fmt)
{
pid_t child_id;
- int i, vecp;
+ int vecp;
char **vec, *file;
if (debugsw || cracked) {
char lastchar = '\n';
if (fd == NOTOK) {
- advise(NULL, "Cannot use NULL command to display content-type "
+ inform("Cannot use NULL command to display content-type "
"%s/%s", ct->c_ctinfo.ci_type, ct->c_ctinfo.ci_subtype);
return NOTOK;
}
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);
fflush (stdout);
- for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
- sleep (5);
+ child_id = fork();
switch (child_id) {
case NOTOK:
advise ("fork", "unable to");
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);
} 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);
}
if ((*p->c_ceopenfnx) (p, &file) == NOTOK)
return NOTOK;
- p->c_storage = add (file, NULL);
+ p->c_storage = mh_xstrdup(FENDNULL(file));
if (p->c_showproc && !strcmp (p->c_showproc, "true"))
return OK;
if (parse_display_string (ct, cp, &xstdin, &xlist, file,
buffer, sizeof(buffer) - 1, 1)) {
- admonish (NULL, "Buffer overflow constructing show command!\n");
+ inform("Buffer overflow constructing show command, continuing...");
return NOTOK;
}
/* 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);
}
case 'F':
/* %f, and stdin is terminal not content */
*xstdin = 1;
- /* and fall... */
+ /* FALLTHRU */
case 'f':
if (multipart) {
case 'p':
/* No longer supported */
- /* and fall... */
+ /* FALLTHRU */
case 'l':
/* display listing prior to displaying content */
/* This will get confused if there are multiple %{}'s,
but its real purpose is to avoid doing bad things
above if a closing brace wasn't found. */
- admonish(NULL,
- "no closing brace for display string escape %s",
+ inform("no closing brace for display string escape %s, continuing...",
cp);
}
break;
quote. */
memmove (pp, pp-1, len+1);
*(pp++-1) = '\\';
- buflen -= 1;
- bp += 1;
+ buflen--;
+ bp++;
}
}
/* If pp is still set, that means we ran out of space. */
if ((conv_desc = iconv_open (dest_charset, src_charset)) ==
(iconv_t) -1) {
- advise (NULL, "Can't convert %s to %s", src_charset, dest_charset);
+ inform("Can't convert %s to %s", src_charset, dest_charset);
free (src_charset);
return NOTOK;
}
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;
}
fseeko (*fp, -inbytes, SEEK_CUR);
if (end > 0) bytes_to_read += inbytes;
- /* advise(NULL, "convert_charset: EINVAL"); */
+ /* inform("convert_charset: EINVAL"); */
continue;
}
if (errno == EILSEQ) {
ib++; inbytes--; /* skip it */
}
(*ob++) = '?'; outbytes --;
- /* advise(NULL, "convert_charset: EILSEQ"); */
+ /* inform("convert_charset: EILSEQ"); */
goto iconv_start;
}
- advise (NULL, "convert_charset: errno = %d", errno);
+ inform("convert_charset: errno = %d", errno);
status = NOTOK;
break;
- } else {
- if (write (fd, dest_buffer, outbytes_before - outbytes)
- < 0) {
- advise (dest, "write");
- }
+ }
+
+ if (write (fd, dest_buffer, outbytes_before - outbytes) < 0) {
+ advise (dest, "write");
}
}
replace_param(&ct->c_ctinfo.ci_first_pm,
&ct->c_ctinfo.ci_last_pm, "charset",
dest_charset, 0);
- outline = output_params(strlen(TYPE_FIELD) + 1 + strlen(ctline),
+ outline = output_params(LEN(TYPE_FIELD) + 1 + strlen(ctline),
ct->c_ctinfo.ci_first_pm, NULL, 0);
if (outline) {
ctline = add(outline, ctline);
#else /* ! HAVE_ICONV */
NMH_UNUSED (message_mods);
- advise (NULL, "Can't convert %s to %s without iconv", src_charset,
+ inform("Can't convert %s to %s without iconv", src_charset,
dest_charset);
errno = ENOSYS;
status = NOTOK;
projects / nmh / blobdiff