X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/27a3458f34afd8c533f33d980228acd2f7eef856..4fa38586e9af919db6853d0436ea96478bdec477:/mac/mtcpnet.c

diff --git a/mac/mtcpnet.c b/mac/mtcpnet.c
index 9d40051d..f355232f 100644
--- a/mac/mtcpnet.c
+++ b/mac/mtcpnet.c
@@ -130,8 +130,9 @@ typedef CALLBACK_API_C(OSErr, AddrToStrProcPtr)(UInt32, unsigned long, char *);
 typedef STACK_UPP_TYPE(AddrToStrProcPtr) AddrToStrUPP;
 enum { uppAddrToStrProcInfo = kCStackBased
        | RESULT_SIZE(SIZE_CODE(sizeof(OSErr)))
-       | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(unsigned long)))
-       | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(char *)))
+       | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(UInt32)))
+       | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(unsigned long)))
+       | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(char *)))
 };
 #define InvokeAddrToStrUPP(selector, addr, addrStr, userUPP)		\
     CALL_THREE_PARAMETER_UPP((userUPP), uppAddrToStrProcInfo, (selector),\
@@ -270,18 +271,20 @@ void mactcp_cleanup(void)
 
 static ResultUPP mactcp_lookupdone_upp;
 
-SockAddr mactcp_namelookup(char *host, char **canonicalname)
+SockAddr mactcp_namelookup(char const *host, char **canonicalname)
 {
     SockAddr ret = smalloc(sizeof(struct SockAddr_tag));
     OSErr err;
     volatile int done = FALSE;
     char *realhost;
+    int realhostlen;
 
     /* Clear the structure. */
     memset(ret, 0, sizeof(struct SockAddr_tag));
     if (mactcp_lookupdone_upp == NULL)
 	mactcp_lookupdone_upp = NewResultUPP(&mactcp_lookupdone);
-    err = StrToAddr(host, &ret->hostinfo, mactcp_lookupdone_upp,
+    /* Casting away const -- hope StrToAddr is sensible */
+    err = StrToAddr((char *)host, &ret->hostinfo, mactcp_lookupdone_upp,
 		    (char *)&done);
     /*
      * PuTTY expects DNS lookups to be synchronous (see bug
@@ -292,9 +295,13 @@ SockAddr mactcp_namelookup(char *host, char **canonicalname)
 	    continue;
     ret->resolved = TRUE;
     
-    if (ret->hostinfo.rtnCode == noErr)
+    if (ret->hostinfo.rtnCode == noErr) {
 	realhost = ret->hostinfo.cname;
-    else
+	/* MacTCP puts trailing dots on canonical names. */
+	realhostlen = strlen(realhost);
+	if (realhost[realhostlen - 1] == '.')
+	    realhost[realhostlen - 1] = '\0';
+    } else
 	realhost = "";
     *canonicalname = smalloc(1+strlen(realhost));
     strcpy(*canonicalname, realhost);
@@ -308,7 +315,7 @@ static pascal void mactcp_lookupdone(struct hostInfo *hi, char *cookie)
     *donep = TRUE;
 }
 
-SockAddr mactcp_nonamelookup(char *host)
+SockAddr mactcp_nonamelookup(char const *host)
 {
     SockAddr ret = smalloc(sizeof(struct SockAddr_tag));
 
@@ -504,7 +511,8 @@ Socket mactcp_new(SockAddr addr, int port, int privport, int oobinline,
     /* Add this to the list of all sockets */
     ret->next = mactcp.socklist;
     ret->prev = &mactcp.socklist;
-    ret->next->prev = &ret->next;
+    if (ret->next != NULL)
+	ret->next->prev = &ret->next;
     mactcp.socklist = ret;
 
     return (Socket)ret;