X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fwhatnowsbr.c;h=f5f78d74b494b7419d11b5bc1b567ba82d3135f7;hp=723d40878785c38703c9bf5f789f0f5bfe4d181d;hb=e87123959d15f3b190494dffdd8bce335c137874;hpb=5dd6771b28c257af405d7248639ed0e3bcdce38b

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 723d408..f5f78d7 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -246,7 +246,7 @@ WhatNow (int argc, char **argv)
     snprintf (prompt, sizeof(prompt), myprompt, invo_name);
     for (;;) {
 	if (!(argp = getans (prompt, aleqs))) {
-	    unlink (LINK);
+	    unlink (altmsglink);
 	    done (1);
 	}
 	switch (smatch (*argp, aleqs)) {
@@ -409,6 +409,11 @@ WhatNow (int argc, char **argv)
 		break;
 	    }
 
+	    if (*(argp+1) == (char *)0) {
+		advise((char *)0, "attach command requires file argument(s).");
+		break;
+	    }
+
 	    /*
 	     *	Build a command line that causes the user's shell to list the file name
 	     *	arguments.  This handles and wildcard expansion, tilde expansion, etc.
@@ -662,9 +667,9 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
 	else
 	    snprintf (altpath, sizeof(altpath), "%s/%s", mp->foldpath, altmsg);
 	if (cwd == NULL)
-	    strncpy (linkpath, LINK, sizeof(linkpath));
+	    strncpy (linkpath, altmsglink, sizeof(linkpath));
 	else
-	    snprintf (linkpath, sizeof(linkpath), "%s/%s", cwd, LINK);
+	    snprintf (linkpath, sizeof(linkpath), "%s/%s", cwd, altmsglink);
     }
 
     if (altmsg) {
@@ -972,18 +977,6 @@ check_draft (char *msgnam)
 }
 
 
-#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  sendswitches[] = {
 #define	ALIASW            0
     { "alias aliasfile", 0 },
@@ -1057,20 +1050,12 @@ static struct swit  sendswitches[] = {
     { "draftmessage msg", -6 },
 #define SNDRFSW          35
     { "nodraftfolder", -3 },
-#define SASLSW           36
-    { "sasl", SASLminc(-4) },
-#define SASLMECHSW       37
-    { "saslmech", SASLminc(-5) },
-#define USERSW           38
-    { "user", SASLminc(-4) },
 #define SNDATTACHSW       39
     { "attach file", 6 },
 #define SNDATTACHFORMAT   40
     { "attachformat", 7 },
 #define PORTSW		  41
     { "port server-port-name/number", 4 },
-#define TLSSW		  42
-    { "tls", TLSminc(-3) },
     { NULL, 0 }
 };
 
@@ -1224,8 +1209,6 @@ sendit (char *sp, char **arg, char *file, int pushed)
 		case SSNDSW:
 		case SOMLSW:
 		case SNOOPSW:
-		case SASLSW:
-		case TLSSW:
 		    vec[vecp++] = --cp;
 		    continue;
 
@@ -1234,8 +1217,6 @@ sendit (char *sp, char **arg, char *file, int pushed)
 		case WIDTHSW:
 		case CLIESW:
 		case SERVSW:
-		case SASLMECHSW:
-		case USERSW:
 		case PORTSW:
 		    vec[vecp++] = --cp;
 		    if (!(cp = *argp++) || *cp == '-') {