projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
slocal: use mhetcdir instead of NMHETCDIR.
[mmh]
/
uip
/
show.c
diff --git
a/uip/show.c
b/uip/show.c
index
6e4f316
..
2f5d9b4
100644
(file)
--- a/
uip/show.c
+++ b/
uip/show.c
@@
-23,21
+23,17
@@
static struct swit switches[] = {
{ "form formfile", 0 },
#define PROGSW 5
{ "moreproc program", 0 },
{ "form formfile", 0 },
#define PROGSW 5
{ "moreproc program", 0 },
-#define NPROGSW 6
- { "nomoreproc", 0 },
-#define LENSW 7
- { "length lines", 0 },
-#define WIDTHSW 8
+#define WIDTHSW 6
{ "width columns", 0 },
{ "width columns", 0 },
-#define SHOWSW 9
+#define SHOWSW 7
{ "showproc program", 0 },
{ "showproc program", 0 },
-#define SHOWMIMESW 10
+#define SHOWMIMESW 8
{ "showmimeproc program", 0 },
{ "showmimeproc program", 0 },
-#define FILESW 11
- { "file file", -4 }, /* interface from showfile */
-#define VERSIONSW 12
+#define FILESW 9
+ { "file file", -4 }, /* interface from lproc (whatnow) */
+#define VERSIONSW 10
{ "version", 0 },
{ "version", 0 },
-#define HELPSW 13
+#define HELPSW 11
{ "help", 0 },
{ NULL, 0 }
};
{ "help", 0 },
{ NULL, 0 }
};
@@
-86,7
+82,6
@@
main(int argc, char **argv)
ambigsw(cp, switches);
done(1);
case UNKWNSW:
ambigsw(cp, switches);
done(1);
case UNKWNSW:
- case NPROGSW:
vec[vecp++] = --cp;
continue;
vec[vecp++] = --cp;
continue;
@@
-126,7
+121,6
@@
usage:
continue;
case PROGSW:
continue;
case PROGSW:
- case LENSW:
case WIDTHSW:
vec[vecp++] = --cp;
if (!(cp = *argp++) || *cp == '-')
case WIDTHSW:
vec[vecp++] = --cp;
if (!(cp = *argp++) || *cp == '-')
@@
-252,22
+246,23
@@
go_to_it: ;
mime = 0;
/* check if any messages are non-text MIME messages */
if (checkmime) {
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
*/
/*
** loop through selected messages
** and check for MIME
*/
- for (msgnum = mp->lowsel;
- msgnum <= mp->hghsel;
+ for (msgnum = mp->lowsel; msgnum <= mp->hghsel;
msgnum++)
msgnum++)
- if (is_selected(mp, msgnum) && is_nontext(m_name(msgnum))) {
+ if (is_selected(mp, msgnum) &&
+ is_nontext(m_name(msgnum))) {
mime = 1;
break;
}
mime = 1;
break;
}
- } else {
- /* check the file for MIME */
- if (is_nontext(vec[vecp - 1]))
- mime = 1;
}
}
}
}
@@
-329,7
+324,7
@@
is_nontext(char *msgnam)
** Check Content-Type field
*/
if (!mh_strcasecmp(name, TYPE_FIELD)) {
** Check Content-Type field
*/
if (!mh_strcasecmp(name, TYPE_FIELD)) {
- int passno;
+ int passno = 1;
char c;
cp = getcpy(buf);
char c;
cp = getcpy(buf);
@@
-339,7
+334,6
@@
is_nontext(char *msgnam)
cp = add(buf, cp);
}
bp = cp;
cp = add(buf, cp);
}
bp = cp;
- passno = 1;
again:
for (; isspace(*bp); bp++)
again:
for (; isspace(*bp); bp++)
@@
-383,7
+377,14
@@
invalid:
*dp = '\0';
if (!*bp)
goto 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;
if ((result = (mh_strcasecmp(bp,
"plain") != 0)))
goto out;
@@
-417,13
+418,6
@@
invalid:
}
/* Check the character set */
result = !check_charset(dp, strlen(dp));
}
/* 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);
}
out:
free(cp);