projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cope with sasl_decode64() returning SASL_CONTINUE as well as SASL_OK.
[mmh]
/
uip
/
show.c
diff --git
a/uip/show.c
b/uip/show.c
index
75e4827
..
e783a79
100644
(file)
--- a/
uip/show.c
+++ b/
uip/show.c
@@
-3,10
+3,15
@@
* show.c -- show/list messages
*
* $Id$
* show.c -- show/list messages
*
* $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh. See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
*/
#include <h/mh.h>
#include <h/mime.h>
*/
#include <h/mh.h>
#include <h/mime.h>
+#include <h/utils.h>
static struct swit switches[] = {
#define CHECKMIMESW 0
static struct swit switches[] = {
#define CHECKMIMESW 0
@@
-49,6
+54,9
@@
static struct swit switches[] = {
*/
static int is_nontext(char *);
*/
static int is_nontext(char *);
+/* prototype from mhlsbr.c */
+int mhl (int, char **);
+
#define SHOW 0
#define NEXT 1
#define PREV 2
#define SHOW 0
#define NEXT 1
#define PREV 2
@@
-73,9
+81,9
@@
main (int argc, char **argv)
/* read user profile/context */
context_read();
/* read user profile/context */
context_read();
- if (!strcasecmp (invo_name, "next")) {
+ if (!mh_strcasecmp (invo_name, "next")) {
mode = NEXT;
mode = NEXT;
- } else if (!strcasecmp (invo_name, "prev")) {
+ } else if (!mh_strcasecmp (invo_name, "prev")) {
mode = PREV;
}
arguments = getarguments (invo_name, argc, argv, 1);
mode = PREV;
}
arguments = getarguments (invo_name, argc, argv, 1);
@@
-171,7
+179,7
@@
usage:
if (folder)
adios (NULL, "only one folder at a time!");
else
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else {
if (mode != SHOW)
goto usage;
} else {
if (mode != SHOW)
goto usage;
@@
-353,6
+361,7
@@
go_to_it: ;
vec[0] = r1bindex (proc, '/');
execvp (proc, vec);
adios (proc, "unable to exec");
vec[0] = r1bindex (proc, '/');
execvp (proc, vec);
adios (proc, "unable to exec");
+ return 0; /* dead code to satisfy the compiler */
}
/*
}
/*
@@
-376,7
+385,8
@@
static int
is_nontext (char *msgnam)
{
int result, state;
is_nontext (char *msgnam)
{
int result, state;
- char *bp, *cp, *dp;
+ unsigned char *bp, *dp;
+ char *cp;
char buf[BUFSIZ], name[NAMESZ];
FILE *fp;
char buf[BUFSIZ], name[NAMESZ];
FILE *fp;
@@
-391,7
+401,7
@@
is_nontext (char *msgnam)
/*
* Check Content-Type field
*/
/*
* Check Content-Type field
*/
- if (!strcasecmp (name, TYPE_FIELD)) {
+ if (!mh_strcasecmp (name, TYPE_FIELD)) {
int passno;
char c;
int passno;
char c;
@@
-446,7
+456,7
@@
invalid:
if (!*bp)
goto invalid;
if (passno > 1) {
if (!*bp)
goto invalid;
if (passno > 1) {
- if ((result = (strcasecmp (bp, "plain") != 0)))
+ if ((result = (mh_strcasecmp (bp, "plain") != 0)))
goto out;
*dp = c;
for (dp++; isspace (*dp); dp++)
goto out;
*dp = c;
for (dp++; isspace (*dp); dp++)
@@
-466,7
+476,7
@@
invalid:
*bp = '\0';
} else {
for (bp = dp; *bp; bp++)
*bp = '\0';
} else {
for (bp = dp; *bp; bp++)
- if (isspace (*bp)) {
+ if (!istoken (*bp)) {
*bp = '\0';
break;
}
*bp = '\0';
break;
}
@@
-478,7
+488,7
@@
invalid:
/* Check the character set */
result = !check_charset (dp, strlen (dp));
} else {
/* Check the character set */
result = !check_charset (dp, strlen (dp));
} else {
- if (!(result = (strcasecmp (bp, "text") != 0))) {
+ if (!(result = (mh_strcasecmp (bp, "text") != 0))) {
*dp = c;
bp = dp;
passno = 2;
*dp = c;
bp = dp;
passno = 2;
@@
-497,7
+507,7
@@
out:
/*
* Check Content-Transfer-Encoding field
*/
/*
* Check Content-Transfer-Encoding field
*/
- if (!strcasecmp (name, ENCODING_FIELD)) {
+ if (!mh_strcasecmp (name, ENCODING_FIELD)) {
cp = add (buf, NULL);
while (state == FLDPLUS) {
state = m_getfld (state, name, buf, sizeof(buf), fp);
cp = add (buf, NULL);
while (state == FLDPLUS) {
state = m_getfld (state, name, buf, sizeof(buf), fp);
@@
-508,9
+518,9
@@
out:
for (dp = bp; istoken (*dp); dp++)
continue;
*dp = '\0';
for (dp = bp; istoken (*dp); dp++)
continue;
*dp = '\0';
- result = (strcasecmp (bp, "7bit")
- && strcasecmp (bp, "8bit")
- && strcasecmp (bp, "binary"));
+ result = (mh_strcasecmp (bp, "7bit")
+ && mh_strcasecmp (bp, "8bit")
+ && mh_strcasecmp (bp, "binary"));
free (cp);
if (result) {
free (cp);
if (result) {