{ "server host", 6 },
#define SNOOPSW 31
{ "snoop", 5 },
-#define ATTACHSW 32
- { "attach", 6 },
-#define ATTACHFORMATSW 33
- { "attachformat", 7 },
-#define PORTSW 34
+#define PORTSW 32
{ "port server-port-name/number" , 4 },
{ NULL, 0 }
};
char *msgs[MAXARGS], *vec[MAXARGS];
struct msgs *mp;
struct stat st;
- char *attach = NULL; /* header field name for attachments */
- int attachformat = 0; /* mhbuild format specifier for attachments */
-#ifdef UCI
- FILE *fp;
-#endif /* UCI */
#ifdef LOCALE
setlocale(LC_ALL, "");
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 (!msgp)
- msgs[msgp++] = "cur";
+ msgs[msgp++] = seq_cur;
maildir = toabsdir(draftfolder);
if (chdir(maildir) == NOTOK)
mp->msgflags |= SEQMOD;
seq_save(mp);
- if ((cp = getenv("SIGNATURE")) == NULL || *cp == 0)
+ if (!(cp = getenv("SIGNATURE")) || !*cp)
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)
closefds(3);
for (msgnum = 0; msgnum < msgp; msgnum++) {
- switch (sendsbr(vec, vecp, msgs[msgnum], &st, 1, attach,
- attachformat)) {
+ switch (sendsbr(vec, vecp, msgs[msgnum], &st, 1)) {
case DONE:
done(++status);
case NOTOK: