Add EndsWithC(char *s, int c) and call it in some initial places.

[nmh] / uip / inc.c

diff --git a/uip/inc.c b/uip/inc.c
index 015fbab502af0a24f8e34ba3cf4afa0adfbf46f4..62c56eb17f5ef749df7f807190aae405f9ac5b8c 100644 (file)
--- 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
@@ -76,12 +70,12 @@
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("snoop", 0, SNOOPSW) \
-    X("sasl", SASLminc(5), SASLSW) \
-    X("nosasl", SASLminc(3), NOSASLSW) \
-    X("saslmech", SASLminc(5), SASLMECHSW) \
+    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,
@@ -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)
@@ -657,7 +653,7 @@ go_to_it:
                    adios (packfile, "write error on");
                fseek (pf, start, SEEK_SET);
            } else {
-               cp = getcpy (m_name (msgnum));
+               cp = mh_xstrdup(m_name (msgnum));
                if ((pf = fopen (cp, "w+")) == NULL)
                    adios (cp, "unable to write");
                chmod (cp, m_gmprot ());
@@ -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 ();
@@ -802,7 +800,7 @@ go_to_it:
            msgnum++;
 
            sp = Maildir[i].filename;
-           cp = getcpy (m_name (msgnum));
+           cp = mh_xstrdup(m_name (msgnum));
            pf = NULL;
            if (!trnflag || link(sp, cp) == -1) {
                static char buf[65536];