Merge branch 'rs/inline-compat-path-macros'

diff --git a/compat/mingw.c b/compat/mingw.c
index 74c6180a201edc578b477ced6557963ce89d1116..c5c37e53ce0fc534b1739a75c4abde0c67027d14 100644 (file)
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1310,8 +1310,7 @@ static int WSAAPI getaddrinfo_stub(const char *node, const char *service,
        else
                ai->ai_canonname = NULL;
 
-       sin = xmalloc(ai->ai_addrlen);
-       memset(sin, 0, ai->ai_addrlen);
+       sin = xcalloc(1, ai->ai_addrlen);
        sin->sin_family = AF_INET;
        /* Note: getaddrinfo is supposed to allow service to be a string,
         * which should be looked up using getservbyname. This is
@@ -2113,6 +2112,10 @@ void mingw_startup()
                        setenv("TMPDIR", tmp, 1);
        }
 
+       /* simulate TERM to enable auto-color (see color.c) */
+       if (!getenv("TERM"))
+               setenv("TERM", "cygwin", 1);
+
        /* initialize critical section for waitpid pinfo_t list */
        InitializeCriticalSection(&pinfo_cs);