projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
In pick(1), attempt to decode each header field as if it were
[mmh]
/
uip
/
inc.c
diff --git
a/uip/inc.c
b/uip/inc.c
index
15aef0e
..
8716edd
100644
(file)
--- a/
uip/inc.c
+++ b/
uip/inc.c
@@
-89,9
+89,11
@@
static struct swit switches[] = {
{ "snoop", -5 },
#define SASLSW 20
{ "sasl", SASLminc(-4) },
{ "snoop", -5 },
#define SASLSW 20
{ "sasl", SASLminc(-4) },
-#define SASLMECHSW 21
+#define NOSASLSW 21
+ { "nosasl", SASLminc(-6) },
+#define SASLMECHSW 22
{ "saslmech", SASLminc(-8) },
{ "saslmech", SASLminc(-8) },
-#define PROXYSW 22
+#define PROXYSW 23
{ "proxy command", 0 },
{ NULL, 0 }
};
{ "proxy command", 0 },
{ NULL, 0 }
};
@@
-202,7
+204,7
@@
main (int argc, char **argv)
struct msgs *mp = NULL;
struct stat st, s1;
FILE *aud = NULL;
struct msgs *mp = NULL;
struct stat st, s1;
FILE *aud = NULL;
- char b[MAXPATHLEN + 1];
+ char b[PATH_MAX + 1];
char *maildir_copy = NULL; /* copy of mail directory because the static gets overwritten */
int nmsgs, nbytes;
char *maildir_copy = NULL; /* copy of mail directory because the static gets overwritten */
int nmsgs, nbytes;
@@
-245,9
+247,6
@@
main (int argc, char **argv)
if (pophost && *pophost)
host = pophost;
if (pophost && *pophost)
host = pophost;
- if ((cp = getenv ("MHPOPDEBUG")) && *cp)
- snoop++;
-
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch (++cp, switches)) {
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch (++cp, switches)) {
@@
-338,7
+337,7
@@
main (int argc, char **argv)
continue;
case PORTSW:
continue;
case PORTSW:
- if (!(host = *argp++) || *port == '-')
+ if (!(port = *argp++) || *port == '-')
adios (NULL, "missing argument to %s", argp[-2]);
continue;
adios (NULL, "missing argument to %s", argp[-2]);
continue;
@@
-362,6
+361,9
@@
main (int argc, char **argv)
case SASLSW:
sasl++;
continue;
case SASLSW:
sasl++;
continue;
+ case NOSASLSW:
+ sasl = 0;
+ continue;
case SASLMECHSW:
if (!(saslmech = *argp++) || *saslmech == '-')
case SASLMECHSW:
if (!(saslmech = *argp++) || *saslmech == '-')