Complete Dominik's name.

[~andy/fetchmail] / servport.c

diff --git a/servport.c b/servport.c
index 8d609bce910c59347cfec6d13bb98d757a1fd077..0a12c640446b35dfa42e8e1405367db85784be84 100644 (file)
--- a/servport.c
+++ b/servport.c
@@ -1,6 +1,6 @@
 /** \file servport.c Resolve service name to port number.
  * \author Matthias Andree
- * \date 2005
+ * \date 2005 - 2006
  *
  * Copyright (C) 2005 by Matthias Andree
  * For license terms, see the file COPYING in this directory.
@@ -23,7 +23,7 @@
 #include <sys/socket.h>
 
 int servport(const char *service) {
-    int port;
+    int port, e;
     unsigned long u;
     char *end;
 
@@ -47,20 +47,27 @@ int servport(const char *service) {
        memset(&hints, 0, sizeof hints);
        hints.ai_family = AF_UNSPEC;
        hints.ai_socktype = SOCK_STREAM;
-       if (getaddrinfo(NULL, service, &hints, &res)) {
+       hints.ai_protocol = IPPROTO_TCP;
+       e = fm_getaddrinfo(NULL, service, &hints, &res);
+       if (e) {
+           report(stderr, GT_("getaddrinfo(NULL, \"%s\") error: %s\n"),
+                   service, gai_strerror(e));
            goto err;
        } else {
            switch(res->ai_addr->sa_family) {
                case AF_INET:
                    port = ntohs(((struct sockaddr_in *)res->ai_addr)->sin_port);
+               break;
 #ifdef AF_INET6
                case AF_INET6:
                    port = ntohs(((struct sockaddr_in6 *)res->ai_addr)->sin6_port);
+               break;
 #endif
                default:
+                   fm_freeaddrinfo(res);
                    goto err;
            }
-           freeaddrinfo(res);
+           fm_freeaddrinfo(res);
        }
     } else {
        if (u == 0 || u > 65535)
@@ -70,7 +77,8 @@ int servport(const char *service) {
 
     return port;
 err:
-    report(stderr, GT_("Cannot resolve service %s to port.  Please specify the service as decimal port number.\n"), service);
+    report(stderr, GT_("Cannot resolve service %s to port number.\n"), service);
+    report(stderr, GT_("Please specify the service as decimal port number.\n"));
     return -1;
 }
 /* end of servport.c */