test/setup-test: use 'set -e' so we stop on compile failure.

[mmh] / mts / smtp / hosts.c

diff --git a/mts/smtp/hosts.c b/mts/smtp/hosts.c
index 55f3393..33eb9e6 100644 (file)
--- a/mts/smtp/hosts.c
+++ b/mts/smtp/hosts.c
@@ -3,6 +3,10 @@
  * hosts.c -- find out the official name of a host
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 /*
@@ -13,7 +17,7 @@
  */
 
 #include <h/mh.h>
-#include <zotnet/mts/mts.h>
+#include <h/mts.h>
 #include <netdb.h>
 
 static struct host {
@@ -32,7 +36,8 @@ static int init_hs(void);
 char *
 OfficialName (char *name)
 {
-    char *p, *q, site[BUFSIZ];
+    unsigned char *p;
+    char *q, site[BUFSIZ];
     struct hostent *hp;
 
     static char buffer[BUFSIZ];
@@ -44,10 +49,10 @@ OfficialName (char *name)
     *q = '\0';
     q = site;
 
-    if (!strcasecmp (LocalName(), site))
+    if (!mh_strcasecmp (LocalName(), site))
        return LocalName();
 
-#ifndef        BIND
+#ifdef HAVE_SETHOSTENT
     sethostent (1);
 #endif
 
@@ -55,14 +60,16 @@ OfficialName (char *name)
        strncpy (buffer, hp->h_name, sizeof(buffer));
        return buffer;
     }
-    if (hosts.h_name || init_hs ())
+    if (hosts.h_name || init_hs ()) {
        for (h = hosts.h_next; h; h = h->h_next)
-           if (!strcasecmp (h->h_name, q))
+           if (!mh_strcasecmp (h->h_name, q)) {
                return h->h_name;
-           else
+           } else {
                for (r = h->h_aliases; *r; r++)
-                   if (!strcasecmp (*r, q))
+                   if (!mh_strcasecmp (*r, q))
                        return h->h_name;
+           }
+    }
 
     strncpy (buffer, site, sizeof(buffer));
     return buffer;
@@ -79,7 +86,8 @@ OfficialName (char *name)
 static int
 init_hs (void)
 {
-    char  *cp, *dp, **q, **r;
+    unsigned char  *cp;
+    char *dp, **q, **r;
     char buffer[BUFSIZ], *aliases[NALIASES];
     register struct host *h;
     register FILE  *fp;