Complete Dominik's name.

[~andy/fetchmail] / env.c

diff --git a/env.c b/env.c
index 457255af8b326e54c2bf9c241a1dc28119659660..edf998983a88be540d639946ed9c8b669711f07f 100644 (file)
--- a/env.c
+++ b/env.c
@@ -30,7 +30,9 @@
 #include <locale.h>
 #endif
 
+#ifndef HAVE_DECL_GETENV
 extern char *getenv(const char *);     /* needed on sysV68 R3V7.1. */
+#endif
 
 void envquery(int argc, char **argv)
 /* set up basic stuff from the environment (including the rc file name) */
@@ -105,10 +107,12 @@ void envquery(int argc, char **argv)
        user = xstrdup(pwp->pw_name);
     }
 
+    endpwent();
+
     /* compute user's home directory */
     home = getenv("HOME_ETC");
     if (!home && !(home = getenv("HOME")))
-       home = pwp->pw_dir;
+       home = xstrdup(pwp->pw_dir);
 
     /* compute fetchmail's home directory */
     if (!(fmhome = getenv("FETCHMAILHOME")))
@@ -147,19 +151,21 @@ char *host_fqdn(int required)
        exit(PS_DNS);
     }
 
-    /* if we got a . in the hostname assume it is a FQDN */
+    /* if we got no . in the hostname, try to canonicalize it,
+     * else assume it is a FQDN */
     if (strchr(tmpbuf, '.') == NULL)
     {
-       /* if we got a basename (as we do in Linux) make a FQDN of it */
+       /* if we got a basename without dots, as we often do in Linux,
+        * look up canonical name (make a FQDN of it) */
        struct addrinfo hints, *res;
        int e;
 
        memset(&hints, 0, sizeof hints);
        hints.ai_family = AF_UNSPEC;
        hints.ai_socktype = SOCK_STREAM;
-       hints.ai_flags=AI_CANONNAME;
+       hints.ai_flags = AI_CANONNAME;
 
-       e = getaddrinfo(tmpbuf, NULL, &hints, &res);
+       e = fm_getaddrinfo(tmpbuf, NULL, &hints, &res);
        if (e) {
            /* exit with error message */
            fprintf(stderr,
@@ -174,8 +180,8 @@ char *host_fqdn(int required)
            }
        }
 
-       result = xstrdup(res->ai_canonname);
-       freeaddrinfo(res);
+       result = xstrdup(res->ai_canonname ? res->ai_canonname : tmpbuf);
+       fm_freeaddrinfo(res);
     }
     else
        result = xstrdup(tmpbuf);
@@ -288,9 +294,9 @@ char *visbuf(const char *buf)
 
     needed = strlen(buf) * 5 + 1; /* worst case: HEX, plus NUL byte */
 
-    if (needed > vbufs) {
+    if (!vbuf || needed > vbufs) {
        vbufs = needed;
-       vbuf = xrealloc(vbuf, vbufs);
+       vbuf = (char *)xrealloc(vbuf, vbufs);
     }
 
     tp = vbuf;
@@ -316,7 +322,7 @@ char *visbuf(const char *buf)
            buf++;
        }
     }
-    *tp++ = '\0';
+    *tp = '\0';
     return(vbuf);
 }
 /* env.c ends here */