X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fshow.c;h=2b53141a80d919e05b0ef15f64093fac6fdc25e3;hp=38bb4b535597b41b455600bef31305325ec087db;hb=f33f12af33361e5d688cd1700c1ee03af5988fd9;hpb=58160ee7bcee7dcc7dbf8e2d5377009e48bcf40b diff --git a/uip/show.c b/uip/show.c index 38bb4b5..2b53141 100644 --- a/uip/show.c +++ b/uip/show.c @@ -21,23 +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 FILESW 11 - { "file file", -4 }, /* interface from showfile */ -#define VERSIONSW 12 +#define FILESW 7 + { "file file", -4 }, /* interface from whatnow (listproc) */ +#define VERSIONSW 8 { "version", 0 }, -#define HELPSW 13 +#define HELPSW 9 { "help", 0 }, { NULL, 0 } }; @@ -47,9 +39,6 @@ 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 @@ -61,7 +50,7 @@ main(int argc, char **argv) int headersw = 1, msgp = 0; 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; @@ -89,7 +78,6 @@ main(int argc, char **argv) ambigsw(cp, switches); done(1); case UNKWNSW: - case NPROGSW: vec[vecp++] = --cp; continue; @@ -128,16 +116,6 @@ 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", @@ -202,10 +180,6 @@ usage: 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))) @@ -259,81 +233,52 @@ go_to_it: ; mime = 0; /* check if any messages are non-text MIME messages */ if (checkmime) { - if (!file) { + 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; + for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) - if (is_selected(mp, msgnum) && is_nontext(m_name(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; } } /* Set the "proc" */ - if (mime) - proc = showmimeproc; - else - proc = showproc; + 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")==0 - && !file - && chdir(maildir = - concat(toabsdir("+"), "/", NULL)) != NOTOK) { - mp->foldpath = concat(mp->foldpath, "/", NULL); - cp = (strncmp(mp->foldpath, maildir, strlen(maildir))==0) ? - 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); @@ -366,7 +311,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); @@ -376,7 +321,6 @@ is_nontext(char *msgnam) cp = add(buf, cp); } bp = cp; - passno = 1; again: for (; isspace(*bp); bp++) @@ -420,7 +364,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; @@ -454,13 +405,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);