Create new mh-format function %(ordinal)

[nmh] / mts / smtp / smtp.c

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 40a3cf11901a449f521b5c72d647294982600239..d5ce434f7137768d2102fe700622f9eafbb92ccf 100644 (file)
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -5,12 +5,15 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/r1bindex.h"
+#include "sbr/client.h"
+#include "sbr/error.h"
 #include "smtp.h"
-#include <h/mts.h>
-#include <h/signals.h>
-#include <h/utils.h>
-#include <h/netsec.h>
+#include "h/mts.h"
+#include "h/signals.h"
+#include "h/utils.h"
+#include "h/netsec.h"
 
 #include <sys/socket.h>
 #include "sbr/base64.h"
@@ -154,7 +157,7 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
      */
 
     if (tls & S_INITTLS) {
-       if (netsec_negotiate_tls(nsc, &errstr) != OK) {
+       if (netsec_negotiate_tls(nsc, &errstr) != OK) {
            sm_end(NOTOK);
            return sm_nerror(errstr);
        }
@@ -383,7 +386,7 @@ sendmail_init (char *client, int watch, int verbose, int debug, int sasl,
             */
 
            if (sasl) {
-               char *server_mechs;
+               char *server_mechs;
                if (! (server_mechs = EHLOset("AUTH"))) {
                    sm_end(NOTOK);
                    return sm_ierror("SMTP server does not support SASL");
@@ -785,7 +788,7 @@ smhear (void)
     char **ehlo = EHLOkeys, *buffer;
 
     if (doingEHLO) {
-       static int at_least_once = 0;
+       static bool at_least_once;
 
        if (at_least_once) {
            char *ep;
@@ -795,7 +798,7 @@ smhear (void)
                free (ep);
            }
        } else {
-           at_least_once = 1;
+           at_least_once = true;
        }
 
        ehlo = EHLOkeys;
@@ -810,7 +813,7 @@ again: ;
     rc = sizeof(sm_reply.text) - 1;
 
     for (more = false; (buffer = netsec_readline(nsc, &buflen,
-                                                &errstr)) != NULL ; ) {
+                                                &errstr)) != NULL ; ) {
 
        if (doingEHLO
                && has_prefix(buffer, "250")
@@ -1045,7 +1048,7 @@ sm_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
            *outdata = NULL;
            *outdatalen = 0;
        } else {
-           rc = decodeBase64(line + 4, outdata, &len, 0, NULL);
+           rc = decodeBase64(line + 4, outdata, &len, 0);
            if (rc != OK) {
                netsec_err(errstr, "Unable to decode base64 response");
                return NOTOK;