X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/49976f25a761e67a05cc493cc7ab88863a587e30..eae4e80fddb67ed353f32a54c9eeed1c1527e5a9:/sbr/mts.c

diff --git a/sbr/mts.c b/sbr/mts.c
index 9db81061..4a056755 100644
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -1,6 +1,4 @@
-
-/*
- * mts.c -- definitions for the mail transport system
+/* mts.c -- definitions for the mail transport system
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -48,9 +46,6 @@ char *mmdflfil = "";
 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 */
@@ -97,8 +92,6 @@ static struct bind binds[] = {
     { "spoollocking", &spoollocking },
     { "uucpldir", &uucpldir },
     { "uucplfil", &uucplfil },
-    { "mmdelim1", &mmdlm1 },
-    { "mmdelim2", &mmdlm2 },
     { "mts",      &mts_method },
     { "sendmail", &sendmail  },
     { "clientname",  &clientname },
@@ -124,7 +117,7 @@ save_mts_method (const char *value) {
         mts_method = "sendmail/pipe";
         sm_mts = MTS_SENDMAIL_PIPE;
     } else {
-        adios (NULL, "unsupported mts selection \"%s\"", value);
+        die("unsupported mts selection \"%s\"", value);
     }
 }
 
@@ -194,7 +187,7 @@ tailor_value (char *s)
 		    }
 		    r = ((unsigned char) *s) != '0' ? 10 : 8;
 		    for (i = 0; isdigit ((unsigned char) *s); s++)
-			i = i * r + ((unsigned char) *s) - '0';
+			i *= r + ((unsigned char) *s) - '0';
 		    s--;
 		    *bp = toascii (i);
 		    break;
@@ -242,7 +235,7 @@ LocalName (int flag)
 	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) {