X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsend.c;h=c19cf4fa880a6f573d364fe4bc4781a8fbeaa794;hp=eb678245a85ffa92995c3ed51d62c42ffd926a12;hb=869aa60129811d7b160f353892dc5956a8aaac22;hpb=3cc8ed080f6e741b8df04a3ebe764c659e75cb38

diff --git a/uip/send.c b/uip/send.c
index eb67824..c19cf4f 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -29,60 +29,26 @@ static struct swit switches[] = {
 	{ "forward", 0 },
 #define NFORWSW  7
 	{ "noforward", 0 },
-#define MIMESW  8
-	{ "mime", 0 },
-#define NMIMESW  9
-	{ "nomime", 0 },
-#define MSGDSW  10
-	{ "msgid", 0 },
-#define NMSGDSW  11
-	{ "nomsgid", 0 },
-#define PUSHSW  12
+#define PUSHSW  8
 	{ "push", 0 },
-#define NPUSHSW  13
+#define NPUSHSW  9
 	{ "nopush", 0 },
-#define UNIQSW  14
+#define UNIQSW  10
 	{ "unique", -6 },
-#define NUNIQSW  15
+#define NUNIQSW  11
 	{ "nounique", -8 },
-#define VERBSW  16
+#define VERBSW  12
 	{ "verbose", 0 },
-#define NVERBSW  17
+#define NVERBSW  13
 	{ "noverbose", 0 },
-#define WATCSW  18
+#define WATCSW  14
 	{ "watch", 0 },
-#define NWATCSW  19
+#define NWATCSW  15
 	{ "nowatch", 0 },
-#define WIDTHSW  20
-	{ "width columns", 0 },
-#define VERSIONSW  21
+#define VERSIONSW  16
 	{ "version", 0 },
-#define HELPSW  22
+#define HELPSW  17
 	{ "help", 0 },
-#define BITSTUFFSW  23
-	{ "dashstuffing", -12 },
-#define NBITSTUFFSW  24
-	{ "nodashstuffing", -14 },
-#define MAILSW  25
-	{ "mail", -4 },
-#define SAMLSW  26
-	{ "saml", -4 },
-#define SENDSW  27
-	{ "send", -4 },
-#define SOMLSW  28
-	{ "soml", -4 },
-#define CLIESW  29
-	{ "client host", -6 },
-#define SERVSW  30
-	{ "server host", 6 },
-#define SNOOPSW  31
-	{ "snoop", 5 },
-#define ATTACHSW  32
-	{ "attach", 6 },
-#define ATTACHFORMATSW  33
-	{ "attachformat", 7 },
-#define PORTSW  34
-	{ "port server-port-name/number" , 4 },
 	{ NULL, 0 }
 };
 
@@ -102,18 +68,12 @@ int
 main(int argc, char **argv)
 {
 	int msgp = 0, distsw = 0, vecp = 1;
-	int mime = 0;
 	int msgnum, status;
 	char *cp, *maildir = NULL;
 	char buf[BUFSIZ], **ap, **argp, **arguments;
 	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, "");
@@ -178,40 +138,18 @@ main(int argc, char **argv)
 				vec[vecp++] = --cp;
 				continue;
 
-			case MIMESW:
-				mime++;
-				vec[vecp++] = --cp;
-				continue;
-			case NMIMESW:
-				mime = 0;
-				vec[vecp++] = --cp;
-				continue;
-
 			case DEBUGSW:
 				debugsw++;  /* fall */
 			case NFILTSW:
 			case FRMTSW:
 			case NFRMTSW:
-			case BITSTUFFSW:
-			case NBITSTUFFSW:
-			case MSGDSW:
-			case NMSGDSW:
 			case WATCSW:
 			case NWATCSW:
-			case MAILSW:
-			case SAMLSW:
-			case SENDSW:
-			case SOMLSW:
-			case SNOOPSW:
 				vec[vecp++] = --cp;
 				continue;
 
 			case ALIASW:
 			case FILTSW:
-			case WIDTHSW:
-			case CLIESW:
-			case SERVSW:
-			case PORTSW:
 				vec[vecp++] = --cp;
 				if (!(cp = *argp++) || *cp == '-')
 					adios(NULL, "missing argument to %s",
@@ -219,25 +157,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;
@@ -288,21 +207,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 +269,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: