X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d7440db1907ae920928843275dcf260934ce5acb..4d6435dbde12837bdf4b4d594e0440392df4b9d3:/uip/inc.c

diff --git a/uip/inc.c b/uip/inc.c
index 43ae88d4..1e9f3c60 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -43,12 +43,6 @@
 #include <h/tws.h>
 #include <h/mts.h>
 
-#ifndef CYRUS_SASL
-# define SASLminc(a) (a)
-#else
-# define SASLminc(a)  0
-#endif
-
 #ifndef TLS_SUPPORT
 # define TLSminc(a) (a)
 #else
@@ -75,13 +69,13 @@
     X("width columns", 0, WIDTHSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
-    X("snoop", -5, SNOOPSW) \
-    X("sasl", SASLminc(5), SASLSW) \
-    X("nosasl", SASLminc(3), NOSASLSW) \
-    X("saslmech", SASLminc(5), SASLMECHSW) \
+    X("snoop", 0, SNOOPSW) \
+    X("sasl", 0, SASLSW) \
+    X("nosasl", 0, NOSASLSW) \
+    X("saslmech", 0, SASLMECHSW) \
     X("initialtls", TLSminc(-10), INITTLSSW) \
-    X("notls", TLSminc(-12), NOTLSSW) \
-    X("authservice", SASLminc(0), AUTHSERVICESW) \
+    X("notls", TLSminc(-5), NOTLSSW) \
+    X("authservice", 0, AUTHSERVICESW) \
     X("proxy command", 0, PROXYSW) \
 
 #define X(sw, minchars, id) id,
@@ -219,7 +213,7 @@ main (int argc, char **argv)
 
     if (nmh_init(argv[0], 1)) { return 1; }
 
-    mts_init (invo_name);
+    mts_init ();
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
@@ -640,12 +634,14 @@ go_to_it:
 
 	    msgnum++;
 	    if (packfile) {
+                size_t len;
+
 		fseek (pf, 0L, SEEK_CUR);
 		pos = ftell (pf);
 		size = 0;
-		if (fwrite (mmdlm1, 1, strlen (mmdlm1), pf) < strlen (mmdlm1)) {
+                len = strlen(mmdlm1);
+		if (fwrite(mmdlm1, 1, len, pf) < len)
 		    advise (mmdlm1, "fwrite");
-		}
 		start = ftell (pf);
 
 		if (pop_retr (i, pop_pack) == NOTOK)
@@ -699,10 +695,12 @@ go_to_it:
 	    charstring_free (scanl);
 
 	    if (packfile) {
+                size_t len;
+
 		fseek (pf, stop, SEEK_SET);
-		if (fwrite (mmdlm2, 1, strlen (mmdlm2), pf) < strlen (mmdlm1)) {
+                len = strlen(mmdlm2);
+		if (fwrite(mmdlm2, 1, len, pf) < len)
 		    advise (mmdlm2, "fwrite");
-		}
 		if (fflush (pf) || ferror (pf)) {
 		    int e = errno;
 		    pop_quit ();