/*
* send.c -- send a composed message
*
- * $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 <signal.h>
+#ifndef CYRUS_SASL
+# define SASLminc(a) (a)
+#else /* 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 },
#define VERSIONSW 26
{ "version", 0 },
#define HELPSW 27
- { "help", 4 },
+ { "help", 0 },
#define BITSTUFFSW 28
{ "dashstuffing", -12 },
#define NBITSTUFFSW 29
#define CLIESW 34
{ "client host", -6 },
#define SERVSW 35
- { "server host", -6 },
+ { "server host", 6 },
#define SNOOPSW 36
- { "snoop", -5 },
+ { "snoop", 5 },
+#define SASLSW 37
+ { "sasl", SASLminc(4) },
+#define SASLMECHSW 38
+ { "saslmech mechanism", SASLminc(-5) },
+#define USERSW 39
+ { "user username", SASLminc(-4) },
+#define ATTACHSW 40
+ { "attach", 6 },
+#define ATTACHFORMATSW 41
+ { "attachformat", 7 },
+#define PORTSW 42
+ { "port server-port-name/number" , 4 },
+#define TLSSW 43
+ { "tls", TLSminc(-3) },
{ NULL, 0 }
};
extern char *annotext;
extern char *distfile;
-extern int errno;
int
main (int argc, char **argv)
char *msgs[MAXARGS], *vec[MAXARGS];
struct msgs *mp;
struct stat st;
-#ifdef UCI
- FILE *fp;
-#endif /* UCI */
+ char *attach = (char *)0; /* header field name for attachments */
+ int attachformat = 0; /* mhbuild format specifier for attachments */
#ifdef LOCALE
setlocale(LC_ALL, "");
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)) {
case SENDSW:
case SOMLSW:
case SNOOPSW:
+ case SASLSW:
+ case TLSSW:
vec[vecp++] = --cp;
continue;
case WIDTHSW:
case CLIESW:
case SERVSW:
+ case SASLMECHSW:
+ case USERSW:
+ case PORTSW:
vec[vecp++] = --cp;
if (!(cp = *argp++) || *cp == '-')
adios (NULL, "missing argument to %s", argp[-2]);
vec[vecp++] = cp;
continue;
+
+ case ATTACHSW:
+ if (!(attach = *argp++) || *attach == '-')
+ adios (NULL, "missing argument to %s", argp[-2]);
+ continue;
+
+ case ATTACHFORMATSW:
+ if (! *argp || **argp == '-')
+ adios (NULL, "missing argument to %s", argp[-1]);
+ else {
+ attachformat = atoi (*argp);
+ if (attachformat < 0 ||
+ attachformat > ATTACHFORMATS - 1) {
+ advise (NULL, "unsupported attachformat %d",
+ attachformat);
+ continue;
+ }
+ }
+ ++argp;
+ continue;
}
} else {
msgs[msgp++] = cp;
if ((cp = getenv ("SIGNATURE")) == NULL || *cp == 0)
if ((cp = context_find ("signature")) && *cp)
m_putenv ("SIGNATURE", cp);
-#ifdef UCI
- else {
- snprintf (buf, sizeof(buf), "%s/.signature", mypath);
- if ((fp = fopen (buf, "r")) != NULL
- && fgets (buf, sizeof buf, fp) != NULL) {
- fclose (fp);
- if (cp = strchr (buf, '\n'))
- *cp = 0;
- m_putenv ("SIGNATURE", buf);
- }
- }
-#endif /* UCI */
for (msgnum = 0; msgnum < msgp; msgnum++)
if (stat (msgs[msgnum], &st) == NOTOK)
&& (distsw = atoi (cp))
&& altmsg) {
vec[vecp++] = "-dist";
- distfile = getcpy (m_scratch (altmsg, invo_name));
+ distfile = getcpy (m_mktemp2 (altmsg, invo_name, NULL, NULL));
+ unlink(distfile);
if (link (altmsg, distfile) == NOTOK) {
if (errno != EXDEV
#ifdef EISREMOTE
)
adios (distfile, "unable to link %s to", altmsg);
free (distfile);
- distfile = getcpy (m_tmpfil (invo_name));
+ distfile = getcpy (m_mktemp2(NULL, invo_name, NULL, NULL));
{
int in, out;
struct stat st;
closefds (3);
for (msgnum = 0; msgnum < msgp; msgnum++) {
- switch (sendsbr (vec, vecp, msgs[msgnum], &st, 1)) {
+ switch (sendsbr (vec, vecp, msgs[msgnum], &st, 1, attach,
+ attachformat)) {
case DONE:
done (++status);
case NOTOK:
context_save (); /* save the context file */
done (status);
+ return 1;
}