projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Deprecate uname() in favour of (Posix) gethostname().
[mmh]
/
uip
/
mhshowsbr.c
diff --git
a/uip/mhshowsbr.c
b/uip/mhshowsbr.c
index
fe9a626
..
3e730ce
100644
(file)
--- a/
uip/mhshowsbr.c
+++ b/
uip/mhshowsbr.c
@@
-36,12
+36,7
@@
extern int debugsw;
int serialsw = 0;
int nolist = 0;
int serialsw = 0;
int nolist = 0;
-
-char *progsw = NULL;
-
-/* flags for moreproc/header display */
char *formsw = NULL;
char *formsw = NULL;
-
pid_t xpid = 0;
pid_t xpid = 0;
@@
-179,9
+174,8
@@
show_single_message(CT ct, char *form)
/*
/*
-** Use the mhlproc to show the header fields
+** Use mhl to show the header fields
*/
*/
-
static void
DisplayMsgHeader(CT ct, char *form)
{
static void
DisplayMsgHeader(CT ct, char *form)
{
@@
-190,17
+184,11
@@
DisplayMsgHeader(CT ct, char *form)
char *vec[8];
vecp = 0;
char *vec[8];
vecp = 0;
- vec[vecp++] = mhbasename(mhlproc);
+ vec[vecp++] = "mhl";
vec[vecp++] = "-form";
vec[vecp++] = form;
vec[vecp++] = "-nobody";
vec[vecp++] = ct->c_file;
vec[vecp++] = "-form";
vec[vecp++] = form;
vec[vecp++] = "-nobody";
vec[vecp++] = ct->c_file;
-
- /* If we've specified -moreproc, then just pass that along. */
- if (progsw) {
- vec[vecp++] = "-moreproc";
- vec[vecp++] = progsw;
- }
vec[vecp] = NULL;
fflush(stdout);
vec[vecp] = NULL;
fflush(stdout);
@@
-211,9
+199,9
@@
DisplayMsgHeader(CT ct, char *form)
/* NOTREACHED */
case OK:
/* NOTREACHED */
case OK:
- execvp(mhlproc, vec);
+ execvp("mhl", vec);
fprintf(stderr, "unable to exec ");
fprintf(stderr, "unable to exec ");
- perror(mhlproc);
+ perror("mhl");
_exit(-1);
/* NOTREACHED */
_exit(-1);
/* NOTREACHED */
@@
-615,8
+603,7
@@
show_text(CT ct, int serial, int alternate)
** if it is not a text part of a multipart/alternative
*/
if (!alternate || ct->c_subtype == TEXT_PLAIN) {
** if it is not a text part of a multipart/alternative
*/
if (!alternate || ct->c_subtype == TEXT_PLAIN) {
- snprintf(buffer, sizeof(buffer), "%%p%s '%%F'",
- progsw ? progsw : moreproc);
+ snprintf(buffer, sizeof(buffer), "%%p%s '%%F'", defaultpager);
cp = (ct->c_showproc = getcpy(buffer));
return show_content_aux(ct, serial, alternate, cp, NULL);
}
cp = (ct->c_showproc = getcpy(buffer));
return show_content_aux(ct, serial, alternate, cp, NULL);
}
@@
-713,7
+700,7
@@
show_multi_internal(CT ct, int serial, int alternate)
for (part = m->mp_parts; part; part = part->mp_next) {
p = part->mp_part;
for (part = m->mp_parts; part; part = part->mp_next) {
p = part->mp_part;
- if (part_ok(p, 0) && type_ok(p, 0)) {
+ if (part_ok(p, 1) && type_ok(p, 1)) {
int inneresult;
inneresult = show_switch(p, nowserial, nowalternate);
int inneresult;
inneresult = show_switch(p, nowserial, nowalternate);