path.c: Move interface to own file.

[nmh] / sbr / mts.c

diff --git a/sbr/mts.c b/sbr/mts.c
index ebb9924ddffc09627146e7dd3f5ff06507f2f596..151a4d0fc755f6c8643d9ad137145ccb26ea9727 100644 (file)
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -5,12 +5,13 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>   /* for snprintf() */
-#include <h/utils.h>
+#include "h/mh.h"
+#include "error.h"
+#include "h/utils.h"

 
 #define nmhetcdir(file) NMHETCDIR#file
 
 
 #define nmhetcdir(file) NMHETCDIR#file
 

-#include <h/mts.h>
+#include "h/mts.h"

 #include <pwd.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <pwd.h>
 #include <sys/socket.h>
 #include <netdb.h>


@@ -46,9 +47,6 @@ char *mmdflfil = "";
 char *uucpldir = "/usr/spool/mail";
 char *uucplfil = "";
 
 char *uucpldir = "/usr/spool/mail";
 char *uucplfil = "";
 

-char *mmdlm1 = "\001\001\001\001\n";
-char *mmdlm2 = "\001\001\001\001\n";
-

 char *spoollocking = DEFAULT_LOCKING;
 
 /* Cache the username, fullname, and mailbox of the user */
 char *spoollocking = DEFAULT_LOCKING;
 
 /* Cache the username, fullname, and mailbox of the user */


@@ -108,7 +106,8 @@ static struct bind binds[] = {
 
 /* Convert name of mts method to integer value and store it. */
 void
 
 /* Convert name of mts method to integer value and store it. */
 void

-save_mts_method (const char *value) {
+save_mts_method (const char *value)
+{

     if (! strcasecmp (value, "smtp")) {
         mts_method = "smtp";
         sm_mts = MTS_SMTP;
     if (! strcasecmp (value, "smtp")) {
         mts_method = "smtp";
         sm_mts = MTS_SMTP;


@@ -120,7 +119,7 @@ save_mts_method (const char *value) {
         mts_method = "sendmail/pipe";
         sm_mts = MTS_SENDMAIL_PIPE;
     } else {
         mts_method = "sendmail/pipe";
         sm_mts = MTS_SENDMAIL_PIPE;
     } else {

-        adios (NULL, "unsupported mts selection \"%s\"", value);
+        die("unsupported mts selection \"%s\"", value);

     }
 }
 
     }
 }
 


@@ -238,7 +237,7 @@ LocalName (int flag)
        gethostname (buf, sizeof(buffer0) - 1);
        /* now fully qualify our name */
 
        gethostname (buf, sizeof(buffer0) - 1);
        /* now fully qualify our name */
 

-       memset(&hints, 0, sizeof(hints));
+        ZERO(&hints);

        hints.ai_flags = AI_CANONNAME;
        hints.ai_family = PF_UNSPEC;
        if (getaddrinfo(buf, NULL, &hints, &res) == 0) {
        hints.ai_flags = AI_CANONNAME;
        hints.ai_family = PF_UNSPEC;
        if (getaddrinfo(buf, NULL, &hints, &res) == 0) {