X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fwhatnowsbr.c;h=4a29a64a6d60a177047835bd9b44b75532e4d567;hb=fecd5d34f65597a4dfa16aeabea7d74b191532c3;hp=723d40878785c38703c9bf5f789f0f5bfe4d181d;hpb=5dd6771b28c257af405d7248639ed0e3bcdce38b;p=mmh diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c index 723d408..4a29a64 100644 --- a/uip/whatnowsbr.c +++ b/uip/whatnowsbr.c @@ -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. @@ -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 == '-') {