X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a2c417d3e1641ba4ab151b7945b90f55176705b1..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/send.c?ds=sidebyside

diff --git a/uip/send.c b/uip/send.c
index d8a92cb3..a205dfec 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -42,8 +42,6 @@
     X("noforward", 0, NFORWSW) \
     X("mime", 0, MIMESW) \
     X("nomime", 0, NMIMESW) \
-    X("eai", 0, EAISW) \
-    X("noeai", 0, NEAISW) \
     X("msgid", 0, MSGDSW) \
     X("nomsgid", 0, NMSGDSW) \
     X("push", 0, PUSHSW) \
@@ -65,7 +63,6 @@
     X("snoop", 5, SNOOPSW) \
     X("sasl", SASLminc(4), SASLSW) \
     X("nosasl", SASLminc(6), NOSASLSW) \
-    X("saslmaxssf", SASLminc(6), SASLMXSSFSW) \
     X("saslmech mechanism", SASLminc(6), SASLMECHSW) \
     X("authservice", SASLminc(0), AUTHSERVICESW) \
     X("user username", SASLminc(-4), USERSW) \
@@ -238,13 +235,6 @@ main (int argc, char **argv)
 		    vec[vecp++] = --cp;
 		    continue;
 
-		case EAISW:
-		    vec[vecp++] = --cp;
-		    continue;
-		case NEAISW:
-		    vec[vecp++] = --cp;
-		    continue;
-
 		case SNOOPSW:
                     snoop++;
 		    vec[vecp++] = --cp;
@@ -296,7 +286,6 @@ main (int argc, char **argv)
 		case WIDTHSW: 
 		case CLIESW: 
 		case SERVSW: 
-		case SASLMXSSFSW:
 		case PORTSW:
 		case MTSSM:
 		case MTSSW:
@@ -329,7 +318,7 @@ main (int argc, char **argv)
     if ((cp = context_find ("Aliasfile"))) {
 	char *dp = NULL;
 
-	for (ap = brkstring(dp = getcpy(cp), " ", "\n"); ap && *ap; ap++) {
+	for (ap = brkstring(dp = mh_xstrdup(cp), " ", "\n"); ap && *ap; ap++) {
 	    vec[vecp++] = "-alias";
 	    vec[vecp++] = *ap;
 	}
@@ -388,7 +377,7 @@ main (int argc, char **argv)
 
 	for (msgp = 0, msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
 	    if (is_selected (mp, msgnum)) {
-		msgs[msgp++] = getcpy (m_name (msgnum));
+		msgs[msgp++] = mh_xstrdup(m_name (msgnum));
 		unset_exists (mp, msgnum);
 	    }
 	}
@@ -425,7 +414,7 @@ go_to_it:
 	    adios(NULL, "unable to create temporary file in %s",
 		  get_temp_dir());
 	}
-	distfile = getcpy (cp);
+	distfile = mh_xstrdup(cp);
 	(void) m_unlink(distfile);
 	if (link (altmsg, distfile) == NOTOK) {
 	    /* Cygwin with FAT32 filesystem produces EPERM. */
@@ -440,7 +429,7 @@ go_to_it:
 		adios(NULL, "unable to create temporary file in %s",
 		      get_temp_dir());
 	    }
-	    distfile = getcpy (cp);
+	    distfile = mh_xstrdup(cp);
 	    {
 		int in, out;
 		struct stat st;