projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nicer structure in summary printing of the configure script.
[mmh]
/
uip
/
whatnowsbr.c
diff --git
a/uip/whatnowsbr.c
b/uip/whatnowsbr.c
index
da2debd
..
4a29a64
100644
(file)
--- a/
uip/whatnowsbr.c
+++ b/
uip/whatnowsbr.c
@@
-2,8
+2,6
@@
/*
* whatnowsbr.c -- the WhatNow shell
*
/*
* 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.
* 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;
}
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.
/*
* 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 },
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 },
{ "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
#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 SSNDSW:
case SOMLSW:
case SNOOPSW:
- case SASLSW:
vec[vecp++] = --cp;
continue;
vec[vecp++] = --cp;
continue;
@@
-1227,8
+1217,6
@@
sendit (char *sp, char **arg, char *file, int pushed)
case WIDTHSW:
case CLIESW:
case SERVSW:
case WIDTHSW:
case CLIESW:
case SERVSW:
- case SASLMECHSW:
- case USERSW:
case PORTSW:
vec[vecp++] = --cp;
if (!(cp = *argp++) || *cp == '-') {
case PORTSW:
vec[vecp++] = --cp;
if (!(cp = *argp++) || *cp == '-') {