projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
When determining the path of the script inside mhmail, handle case
[mmh]
/
uip
/
whom.c
diff --git
a/uip/whom.c
b/uip/whom.c
index
51ce5fe
..
ad49d86
100644
(file)
--- a/
uip/whom.c
+++ b/
uip/whom.c
@@
-2,8
+2,6
@@
/*
* whom.c -- report to whom a message would be sent
*
/*
* whom.c -- report to whom a message would be sent
*
- * $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.
* 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.
@@
-19,6
+17,12
@@
# define SASLminc(a) 0
#endif /* CYRUS_SASL */
# define SASLminc(a) 0
#endif /* CYRUS_SASL */
+#ifndef TLS_SUPPORT
+# define TLSminc(a) (a)
+#else /* TLS_SUPPORT */
+# define TLSminc(a) 0
+#endif /* TLS_SUPPORT */
+
static struct swit switches[] = {
#define ALIASW 0
{ "alias aliasfile", 0 },
static struct swit switches[] = {
#define ALIASW 0
{ "alias aliasfile", 0 },
@@
-52,6
+56,12
@@
static struct swit switches[] = {
{ "user username", SASLminc(-4) },
#define PORTSW 15
{ "port server port name/number", 4 },
{ "user username", SASLminc(-4) },
#define PORTSW 15
{ "port server port name/number", 4 },
+#define TLSSW 16
+ { "tls", TLSminc(-3) },
+#define NTLSSW 17
+ { "notls", TLSminc(-5) },
+#define MTSSW 18
+ { "mts smtp|sendmail/smtp|sendmail/pipe", 0 },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-82,6
+92,9
@@
main (int argc, char **argv)
vec[vecp++] = "-library";
vec[vecp++] = getcpy (m_maildir (""));
vec[vecp++] = "-library";
vec[vecp++] = getcpy (m_maildir (""));
+ /* Don't need to feed fileproc or mhlproc to post because
+ it doesn't use them when used for whom. */
+
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch (++cp, switches)) {
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch (++cp, switches)) {
@@
-94,15
+107,17
@@
main (int argc, char **argv)
case HELPSW:
snprintf (buf, sizeof(buf), "%s [switches] [file]", invo_name);
print_help (buf, switches, 1);
case HELPSW:
snprintf (buf, sizeof(buf), "%s [switches] [file]", invo_name);
print_help (buf, switches, 1);
- done (1);
+ done (0);
case VERSIONSW:
print_version(invo_name);
case VERSIONSW:
print_version(invo_name);
- done (1);
+ done (0);
case CHKSW:
case NOCHKSW:
case SNOOPSW:
case SASLSW:
case CHKSW:
case NOCHKSW:
case SNOOPSW:
case SASLSW:
+ case TLSSW:
+ case NTLSSW:
vec[vecp++] = --cp;
continue;
vec[vecp++] = --cp;
continue;
@@
-135,6
+150,7
@@
main (int argc, char **argv)
case USERSW:
case PORTSW:
case SASLMECHSW:
case USERSW:
case PORTSW:
case SASLMECHSW:
+ case MTSSW:
vec[vecp++] = --cp;
if (!(cp = *argp++) || *cp == '-')
adios (NULL, "missing argument to %s", argp[-2]);
vec[vecp++] = --cp;
if (!(cp = *argp++) || *cp == '-')
adios (NULL, "missing argument to %s", argp[-2]);