{ "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 }
};
/*
** static prototypes
*/
-static int is_nontext(char *);
+static int is_mime(char *);
#define SHOW 0
#define NEXT 1
#define PREV 2
+char *showproc = "mhl";
+char *showmimeproc = "mhshow";
int
main(int argc, char **argv)
ambigsw(cp, switches);
done(1);
case UNKWNSW:
- case NPROGSW:
vec[vecp++] = --cp;
continue;
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",
goto go_to_it;
}
-#ifdef WHATNOW
- if (!msgp && !folder && mode == SHOW &&
- (cp = getenv("mhdraft")) && *cp) {
- vec[vecp++] = cp;
- goto go_to_it;
- }
-#endif /* WHATNOW */
-
if (!msgp) {
switch (mode) {
case NEXT:
mime = 0;
/* check if any messages are non-text MIME messages */
if (checkmime) {
- 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))) {
+ if (file) {
+ if (is_mime(vec[vecp - 1])) {
+ mime = 1;
+ }
+ } else {
+ for (msgnum = mp->lowsel; msgnum <= mp->hghsel;
+ msgnum++) {
+ if (!is_selected(mp, msgnum)) {
+ continue;
+ }
+ snprintf(buf, sizeof buf, "%s/%d",
+ toabsdir(folder), msgnum);
+ if (is_mime(buf)) {
mime = 1;
break;
}
- } else {
- /* check the file for MIME */
- if (is_nontext(vec[vecp - 1]))
- mime = 1;
+ }
}
}
/* Set the "proc" */
proc = (mime) ? showmimeproc : showproc;
- if (folder && !file)
- m_putenv("mhfolder", folder);
-
/* Special-cased because mhshow takes msg not files args. */
if (strcmp(mhbasename(proc), "mhshow")==0) {
if (file) {
}
/*
-** Check if a message or file contains any non-text parts
+** Check if a message or file contains MIME.
*/
static int
-is_nontext(char *msgnam)
+is_mime(char *msgnam)
{
- int result, state;
- unsigned char *bp, *dp;
- char *cp;
+ int state = FLD;
char buf[BUFSIZ], name[NAMESZ];
FILE *fp;
if ((fp = fopen(msgnam, "r")) == NULL)
return 0;
- for (state = FLD;;) {
+ while (1) {
switch (state = m_getfld(state, name, buf, sizeof(buf), fp)) {
case FLD:
case FLDPLUS:
case FLDEOF:
- /*
- ** Check Content-Type field
- */
- if (!mh_strcasecmp(name, TYPE_FIELD)) {
- int passno;
- char c;
-
- cp = getcpy(buf);
- while (state == FLDPLUS) {
- state = m_getfld(state, name, buf,
- sizeof(buf), fp);
- cp = add(buf, cp);
- }
- bp = cp;
- passno = 1;
-
-again:
- for (; isspace(*bp); bp++)
- continue;
- if (*bp == '(') {
- int i;
-
- for (bp++, i = 0;;) {
- switch (*bp++) {
- case '\0':
-invalid:
- result = 0;
- goto out;
- case '\\':
- if (*bp++ == '\0')
- goto invalid;
- continue;
- case '(':
- i++;
- /* and fall... */
- default:
- continue;
- case ')':
- if (--i < 0)
- break;
- continue;
- }
- break;
- }
- }
- if (passno == 2) {
- if (*bp != '/')
- goto invalid;
- bp++;
- passno = 3;
- goto again;
- }
- for (dp = bp; istoken(*dp); dp++)
- continue;
- c = *dp;
- *dp = '\0';
- if (!*bp)
- goto invalid;
- if (passno > 1) {
- if ((result = (mh_strcasecmp(bp,
- "plain") != 0)))
- goto out;
- *dp = c;
- for (dp++; isspace(*dp); dp++)
- continue;
- if (*dp) {
- if ((result = !uprf(dp,
- "charset")))
- goto out;
- dp += sizeof("charset") - 1;
- while (isspace(*dp))
- dp++;
- if (*dp++ != '=')
- goto invalid;
- while (isspace(*dp))
- dp++;
- if (*dp == '"') {
- if ((bp = strchr(++dp, '"')))
- *bp = '\0';
- } else {
- for (bp = dp; *bp; bp++)
- if (!istoken(*bp)) {
- *bp = '\0';
- break;
- }
- }
- } else {
- /* Default character set */
- dp = "US-ASCII";
- }
- /* 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);
- if (result) {
- fclose(fp);
- return result;
- }
- break;
- }
-
- /*
- ** Check Content-Transfer-Encoding field
- */
- if (!mh_strcasecmp(name, ENCODING_FIELD)) {
- cp = getcpy(buf);
- while (state == FLDPLUS) {
- state = m_getfld(state, name, buf,
- sizeof(buf), fp);
- cp = add(buf, cp);
- }
- for (bp = cp; isspace(*bp); bp++)
- continue;
- for (dp = bp; istoken(*dp); dp++)
- continue;
- *dp = '\0';
- result = (mh_strcasecmp(bp, "7bit")
- && mh_strcasecmp(bp, "8bit")
- && mh_strcasecmp(bp, "binary"));
-
- free(cp);
- if (result) {
- fclose(fp);
- return result;
- }
- break;
+ /* Does it have a Mime-Version header? */
+ if (mh_strcasecmp(name, VRSN_FIELD)==0) {
+ fclose(fp);
+ return 1;
}
- /*
- ** Just skip the rest of this header
- ** field and go to next one.
- */
- while (state == FLDPLUS)
+ /* else skip the rest of this header field and go on */
+ while (state == FLDPLUS) {
state = m_getfld(state, name, buf, sizeof(buf),
fp);
+ }
break;
- /*
- ** We've passed the message header,
- ** so message is just text.
- */
default:
+ /* We've passed the header, so message is just text */
fclose(fp);
return 0;
}
projects / mmh / blobdiff