From 41f62fc47ef6f2d223b7584b3bb912e65a630445 Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Fri, 10 Feb 2012 14:54:26 +0100 Subject: [PATCH] show: Special-cased -show(mime)proc for mhshow: it needs msgs not file args. A similar test had already been there before the last rework. --- uip/show.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/uip/show.c b/uip/show.c index 8609293..6e4f316 100644 --- a/uip/show.c +++ b/uip/show.c @@ -272,19 +272,23 @@ go_to_it: ; } /* Set the "proc" */ - if (mime) - proc = showmimeproc; - else - proc = showproc; + proc = (mime) ? showmimeproc : showproc; if (folder && !file) m_putenv("mhfolder", folder); - /* If the "proc" is "mhshow", add "-file" if showing file. */ - if (strcmp(mhbasename(proc), "mhshow") == 0 && file ) { - vec[vecp] = vec[vecp - 1]; - vec[vecp - 1] = "-file"; - vec[++vecp] = NULL; + /* Special-cased because mhshow takes msg not files args. */ + if (strcmp(mhbasename(proc), "mhshow")==0) { + if (file) { + vec[vecp] = vec[vecp - 1]; + vec[vecp - 1] = "-file"; + vec[++vecp] = NULL; + } + vec[vecp++] = concat("+", folder, NULL); + vec[vecp] = NULL; + vec[0] = mhbasename(proc); + execvp(proc, vec); + adios(proc, "unable to exec"); } /* Add the path to the message names. */ -- 1.7.10.4