X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fwhatnowsbr.c;h=4a29a64a6d60a177047835bd9b44b75532e4d567;hb=5d43a99db70c12a673028c7758c20cbe3e13ef5f;hp=da2debde06cde0c683fe10e81f25684d94d2f8a2;hpb=2f689a1cb907a5de04e6d39ffd217a69af3216c7;p=mmh

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index da2debd..4a29a64 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -2,8 +2,6 @@
 /*
  * whatnowsbr.c -- the WhatNow shell
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -411,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.
@@ -974,12 +977,6 @@ check_draft (char *msgnam)
 }
 
 
-#ifndef CYRUS_SASL
-# define SASLminc(a) (a)
-#else /* CYRUS_SASL */
-# define SASLminc(a)  0
-#endif /* CYRUS_SASL */
-
 static struct swit  sendswitches[] = {
 #define	ALIASW            0
     { "alias aliasfile", 0 },
@@ -1053,12 +1050,6 @@ 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
@@ -1218,7 +1209,6 @@ sendit (char *sp, char **arg, char *file, int pushed)
 		case SSNDSW:
 		case SOMLSW:
 		case SNOOPSW:
-		case SASLSW:
 		    vec[vecp++] = --cp;
 		    continue;
 
@@ -1227,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 == '-') {