X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fwhatnowsbr.c;h=cf577927fecd677817c6f6afa4b7705ba5f9d230;hb=6b74eb547bce7c4436fc366073321b2f480c30da;hp=b12307dc365cf9681a6541151088aaa323e578c2;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b;p=mmh

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index b12307d..cf57792 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -26,7 +26,7 @@ static struct swit whatnowswitches[] = {
 #define VERSIONSW               6
     { "version", 0 },
 #define	HELPSW                  7
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -363,13 +363,14 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
 		else {
 #endif
 		if (((status & 0xff00) != 0xff00)
-			&& (!reedit || (status & 0x00ff)))
+		    && (!reedit || (status & 0x00ff))) {
 		    if (!use && (status & 0xff00) &&
 			    (rename (file, cp = m_backup (file)) != NOTOK)) {
 			advise (NULL, "problems with edit--draft left in %s", cp);
 		    } else {
 			advise (NULL, "problems with edit--%s preserved", file);
 		    }
+		}
 		status = -2;	/* maybe "reedit ? -2 : -1"? */
 		break;
 #ifdef ATTVIBUG
@@ -606,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 },
@@ -654,7 +661,7 @@ static struct swit  sendswitches[] = {
 #define SVERSIONSW       22
     { "version", 0 },
 #define	SHELPSW          23
-    { "help", 4 },
+    { "help", 0 },
 #define BITSTUFFSW       24
     { "dashstuffing", -12 },
 #define NBITSTUFFSW      25
@@ -679,6 +686,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) },
     { NULL, 0 }
 };
 
@@ -829,6 +842,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
 		case SSNDSW: 
 		case SOMLSW: 
 		case SNOOPSW: 
+		case SASLSW:
 		    vec[vecp++] = --cp;
 		    continue;
 
@@ -837,6 +851,8 @@ sendit (char *sp, char **arg, char *file, int pushed)
 		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]);