X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fshow.c;h=4abc3d74cf93a62a3b5856b1c55a3006d1c1a7e3;hp=f279cdedf675a1da8c49c04c893cafb1d1ad7116;hb=5ee5d678d59cf1deea31126bc886333f1be4571d;hpb=a7771fd2e83d64228fb675749fc936151249dbd3 diff --git a/uip/show.c b/uip/show.c index f279cde..4abc3d7 100644 --- a/uip/show.c +++ b/uip/show.c @@ -21,25 +21,15 @@ static struct swit switches[] = { { "noheader", 0 }, #define FORMSW 4 { "form formfile", 0 }, -#define PROGSW 5 - { "moreproc program", 0 }, -#define NPROGSW 6 - { "nomoreproc", 0 }, -#define LENSW 7 - { "length lines", 0 }, -#define WIDTHSW 8 - { "width columns", 0 }, -#define SHOWSW 9 +#define SHOWSW 5 { "showproc program", 0 }, -#define SHOWMIMESW 10 +#define SHOWMIMESW 6 { "showmimeproc program", 0 }, -#define NSHOWSW 11 - { "noshowproc", 0 }, -#define FILESW 12 - { "file file", -4 }, /* interface from showfile */ -#define VERSIONSW 13 +#define FILESW 7 + { "file file", -4 }, /* interface from whatnow (listproc) */ +#define VERSIONSW 8 { "version", 0 }, -#define HELPSW 14 +#define HELPSW 9 { "help", 0 }, { NULL, 0 } }; @@ -49,21 +39,20 @@ static struct swit switches[] = { */ static int is_nontext(char *); -/* prototype from mhlsbr.c */ -int mhl(int, char **); - #define SHOW 0 #define NEXT 1 #define PREV 2 +char *showproc = "mhl"; +char *showmimeproc = "mhshow"; int main(int argc, char **argv) { int headersw = 1, msgp = 0; - int nshow = 0, checkmime = 1, mime; + int checkmime = 1, mime; int vecp = 1, procp = 1, mode = SHOW, msgnum; - char *cp, *maildir, *file = NULL, *folder = NULL, *proc; + char *cp, *file = NULL, *folder = NULL, *proc; char buf[BUFSIZ], **argp, **arguments; char *msgs[MAXARGS], *vec[MAXARGS]; struct msgs *mp = NULL; @@ -91,7 +80,6 @@ main(int argc, char **argv) ambigsw(cp, switches); done(1); case UNKWNSW: - case NPROGSW: vec[vecp++] = --cp; continue; @@ -130,24 +118,10 @@ usage: vec[vecp++] = getcpy(etcpath(cp)); continue; - case PROGSW: - case LENSW: - case WIDTHSW: - vec[vecp++] = --cp; - if (!(cp = *argp++) || *cp == '-') - adios(NULL, "missing argument to %s", - argp[-2]); - vec[vecp++] = cp; - continue; - case SHOWSW: if (!(showproc = *argp++) || *showproc == '-') adios(NULL, "missing argument to %s", argp[-2]); - nshow = 0; - continue; - case NSHOWSW: - nshow++; continue; case SHOWMIMESW: @@ -155,7 +129,6 @@ usage: *showmimeproc == '-') adios(NULL, "missing argument to %s", argp[-2]); - nshow = 0; continue; case CHECKMIMESW: checkmime++; @@ -196,23 +169,19 @@ usage: if (!msgp) { switch (mode) { case NEXT: - msgs[msgp++] = "next"; + msgs[msgp++] = seq_next; break; case PREV: - msgs[msgp++] = "prev"; + msgs[msgp++] = seq_prev; break; default: - msgs[msgp++] = "cur"; + msgs[msgp++] = seq_cur; break; } } if (!folder) folder = getcurfol(); - maildir = toabsdir(folder); - - if (chdir(maildir) == NOTOK) - adios(maildir, "unable to change directory to"); /* read folder and create message structure */ if (!(mp = folder_read(folder))) @@ -264,87 +233,54 @@ go_to_it: ; ** Decide which "proc" to use */ mime = 0; - if (nshow) { - proc = catproc; - } else { - /* check if any messages are non-text MIME messages */ - if (checkmime && !getenv("NOMHNPROC")) { - if (!file) { - /* - ** loop through selected messages - ** and check for MIME - */ - for (msgnum = mp->lowsel; - msgnum <= mp->hghsel; - msgnum++) - if (is_selected(mp, msgnum) && is_nontext(m_name(msgnum))) { - mime = 1; - break; - } - } else { - /* check the file for MIME */ - if (is_nontext(vec[vecp - 1])) - mime = 1; + /* check if any messages are non-text MIME messages */ + if (checkmime) { + if (file) { + /* check the file for MIME */ + if (is_nontext(vec[vecp - 1])) { + mime = 1; } + } else { + /* + ** loop through selected messages + ** and check for MIME + */ + for (msgnum = mp->lowsel; msgnum <= mp->hghsel; + msgnum++) + if (is_selected(mp, msgnum) && + is_nontext(m_name(msgnum))) { + mime = 1; + break; + } } - - /* Set the "proc" */ - if (mime) - proc = showmimeproc; - else - proc = showproc; } + /* Set the "proc" */ + proc = (mime) ? showmimeproc : showproc; + if (folder && !file) m_putenv("mhfolder", folder); - /* - ** For backward compatibility, if the "proc" is mhn, - ** then add "-show" option. Add "-file" if showing - ** file. - */ - if (strcmp(mhbasename(proc), "mhn") == 0) { + /* 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"; - vecp++; + vec[++vecp] = NULL; } - vec[vecp++] = "-show"; + vec[vecp++] = concat("+", folder, NULL); vec[vecp] = NULL; + vec[0] = mhbasename(proc); + execvp(proc, vec); + adios(proc, "unable to exec"); } - /* 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; - } - - /* - ** If "proc" is mhl, then run it internally - ** rather than exec'ing it. - */ - if (strcmp(mhbasename(proc), "mhl") == 0) { - vec[0] = "mhl"; - mhl(vecp, vec); - done(0); - } - - /* - ** If you are not using a nmh command as your "proc", then - ** add the path to the message names. Currently, we are just - ** checking for mhn here, since we've already taken care of mhl. - */ - if (!strcmp(mhbasename(proc), "mhl") - && !file - && chdir(maildir = - concat(toabsdir("+"), "/", NULL)) != NOTOK) { - mp->foldpath = concat(mp->foldpath, "/", NULL); - cp = isprefix(maildir, mp->foldpath) - ? mp->foldpath + strlen(maildir) - : mp->foldpath; - for (msgnum = procp; msgnum < vecp; msgnum++) - vec[msgnum] = concat(cp, vec[msgnum], NULL); + /* Add the path to the message names. */ + if (!file) { + for (msgnum = procp; msgnum < vecp; msgnum++) { + vec[msgnum] = concat(mp->foldpath, "/", + vec[msgnum], NULL); + } } vec[0] = mhbasename(proc); @@ -377,7 +313,7 @@ is_nontext(char *msgnam) ** Check Content-Type field */ if (!mh_strcasecmp(name, TYPE_FIELD)) { - int passno; + int passno = 1; char c; cp = getcpy(buf); @@ -387,7 +323,6 @@ is_nontext(char *msgnam) cp = add(buf, cp); } bp = cp; - passno = 1; again: for (; isspace(*bp); bp++) @@ -431,7 +366,14 @@ invalid: *dp = '\0'; if (!*bp) goto invalid; - if (passno > 1) { + if (passno == 1) { + if (!(result = (mh_strcasecmp(bp, "text") != 0))) { + *dp = c; + bp = dp; + passno = 2; + goto again; + } + } else { if ((result = (mh_strcasecmp(bp, "plain") != 0))) goto out; @@ -465,13 +407,6 @@ invalid: } /* Check the character set */ result = !check_charset(dp, strlen(dp)); - } else { - if (!(result = (mh_strcasecmp(bp, "text") != 0))) { - *dp = c; - bp = dp; - passno = 2; - goto again; - } } out: free(cp);