projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed rmm, send, and whatnow man pages to be consistent with the
[mmh]
/
uip
/
send.c
diff --git
a/uip/send.c
b/uip/send.c
index
ad1cf39
..
5034121
100644
(file)
--- a/
uip/send.c
+++ b/
uip/send.c
@@
-102,18
+102,26
@@
static struct swit switches[] = {
{ "snoop", 5 },
#define SASLSW 37
{ "sasl", SASLminc(4) },
{ "snoop", 5 },
#define SASLSW 37
{ "sasl", SASLminc(4) },
-#define SASLMECHSW 38
+#define NOSASLSW 38
+ { "nosasl", SASLminc(-6) },
+#define SASLMXSSFSW 39
+ { "saslmaxssf", SASLminc(-10) },
+#define SASLMECHSW 40
{ "saslmech mechanism", SASLminc(-5) },
{ "saslmech mechanism", SASLminc(-5) },
-#define USERSW 39
+#define USERSW 41
{ "user username", SASLminc(-4) },
{ "user username", SASLminc(-4) },
-#define ATTACHSW 40
+#define ATTACHSW 42
{ "attach", 6 },
{ "attach", 6 },
-#define ATTACHFORMATSW 41
+#define NOATTACHSW 43
+ { "noattach", 0 },
+#define ATTACHFORMATSW 44
{ "attachformat", 7 },
{ "attachformat", 7 },
-#define PORTSW 42
+#define PORTSW 45
{ "port server-port-name/number" , 4 },
{ "port server-port-name/number" , 4 },
-#define TLSSW 43
+#define TLSSW 46
{ "tls", TLSminc(-3) },
{ "tls", TLSminc(-3) },
+#define NTLSSW 47
+ { "notls", TLSminc(-5) },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-151,8
+159,8
@@
main (int argc, char **argv)
char *msgs[MAXARGS], *vec[MAXARGS];
struct msgs *mp;
struct stat st;
char *msgs[MAXARGS], *vec[MAXARGS];
struct msgs *mp;
struct stat st;
- char *attach = (char *)0; /* header field name for attachments */
- int attachformat = 0; /* mhbuild format specifier for attachments */
+ char *attach = NMH_ATTACH_HEADER; /* header field name for attachments */
+ int attachformat = 1; /* mhbuild format specifier for attachments */
#ifdef LOCALE
setlocale(LC_ALL, "");
#ifdef LOCALE
setlocale(LC_ALL, "");
@@
-168,6
+176,16
@@
main (int argc, char **argv)
vec[vecp++] = "-library";
vec[vecp++] = getcpy (m_maildir (""));
vec[vecp++] = "-library";
vec[vecp++] = getcpy (m_maildir (""));
+ if ((cp = context_find ("fileproc"))) {
+ vec[vecp++] = "-fileproc";
+ vec[vecp++] = cp;
+ }
+
+ if ((cp = context_find ("mhlproc"))) {
+ vec[vecp++] = "-mhlproc";
+ vec[vecp++] = cp;
+ }
+
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch (++cp, switches)) {
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch (++cp, switches)) {
@@
-268,7
+286,9
@@
main (int argc, char **argv)
case SOMLSW:
case SNOOPSW:
case SASLSW:
case SOMLSW:
case SNOOPSW:
case SASLSW:
+ case NOSASLSW:
case TLSSW:
case TLSSW:
+ case NTLSSW:
vec[vecp++] = --cp;
continue;
vec[vecp++] = --cp;
continue;
@@
-278,6
+298,7
@@
main (int argc, char **argv)
case CLIESW:
case SERVSW:
case SASLMECHSW:
case CLIESW:
case SERVSW:
case SASLMECHSW:
+ case SASLMXSSFSW:
case USERSW:
case PORTSW:
vec[vecp++] = --cp;
case USERSW:
case PORTSW:
vec[vecp++] = --cp;
@@
-290,6
+311,9
@@
main (int argc, char **argv)
if (!(attach = *argp++) || *attach == '-')
adios (NULL, "missing argument to %s", argp[-2]);
continue;
if (!(attach = *argp++) || *attach == '-')
adios (NULL, "missing argument to %s", argp[-2]);
continue;
+ case NOATTACHSW:
+ attach = NULL;
+ continue;
case ATTACHFORMATSW:
if (! *argp || **argp == '-')
case ATTACHFORMATSW:
if (! *argp || **argp == '-')
@@
-416,6
+440,7
@@
go_to_it:
&& altmsg) {
vec[vecp++] = "-dist";
distfile = getcpy (m_mktemp2 (altmsg, invo_name, NULL, NULL));
&& altmsg) {
vec[vecp++] = "-dist";
distfile = getcpy (m_mktemp2 (altmsg, invo_name, NULL, NULL));
+ unlink(distfile);
if (link (altmsg, distfile) == NOTOK) {
if (errno != EXDEV
#ifdef EISREMOTE
if (link (altmsg, distfile) == NOTOK) {
if (errno != EXDEV
#ifdef EISREMOTE