X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsend.c;h=2092c3723a742ade71e077910cdc64ca50236ff9;hb=2c3b7da72126a21f05130e9ed6bb70f43624ce25;hp=2847add268a5015b0da1b48349859804e54c2b65;hpb=5b792c4424571f05bc2008e3109797d18d7d00d1;p=mmh

diff --git a/uip/send.c b/uip/send.c
index 2847add..2092c37 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -77,11 +77,7 @@ static struct swit switches[] = {
 	{ "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 }
 };
@@ -109,11 +105,6 @@ main(int argc, char **argv)
 	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, "");
@@ -219,25 +210,6 @@ main(int argc, char **argv)
 				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;
@@ -258,7 +230,7 @@ main(int argc, char **argv)
 	}
 
 	if (!msgp)
-		msgs[msgp++] = "cur";
+		msgs[msgp++] = seq_cur;
 	maildir = toabsdir(draftfolder);
 
 	if (chdir(maildir) == NOTOK)
@@ -288,21 +260,9 @@ main(int argc, char **argv)
 	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)
@@ -362,8 +322,7 @@ main(int argc, char **argv)
 	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: