projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Included code reorg of zotnet/mts
[mmh]
/
uip
/
whatnowsbr.c
diff --git
a/uip/whatnowsbr.c
b/uip/whatnowsbr.c
index
854a972
..
cf57792
100644
(file)
--- a/
uip/whatnowsbr.c
+++ b/
uip/whatnowsbr.c
@@
-26,7
+26,7
@@
static struct swit whatnowswitches[] = {
#define VERSIONSW 6
{ "version", 0 },
#define HELPSW 7
#define VERSIONSW 6
{ "version", 0 },
#define HELPSW 7
- { "help", 4 },
+ { "help", 0 },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-607,6
+607,12
@@
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 },
@@
-655,7
+661,7
@@
static struct swit sendswitches[] = {
#define SVERSIONSW 22
{ "version", 0 },
#define SHELPSW 23
#define SVERSIONSW 22
{ "version", 0 },
#define SHELPSW 23
- { "help", 4 },
+ { "help", 0 },
#define BITSTUFFSW 24
{ "dashstuffing", -12 },
#define NBITSTUFFSW 25
#define BITSTUFFSW 24
{ "dashstuffing", -12 },
#define NBITSTUFFSW 25
@@
-680,6
+686,12
@@
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) },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-830,6
+842,7
@@
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;
@@
-838,6
+851,8
@@
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:
vec[vecp++] = --cp;
if (!(cp = *argp++) || *cp == '-') {
advise (NULL, "missing argument to %s", argp[-2]);
vec[vecp++] = --cp;
if (!(cp = *argp++) || *cp == '-') {
advise (NULL, "missing argument to %s", argp[-2]);