X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/2e96d5041e9e7a241d14305ae3e89637476c4968..e02b0bc2a713edfdf9bf183ca6561a6768483eba:/mac/mtcpnet.c

diff --git a/mac/mtcpnet.c b/mac/mtcpnet.c
index 6cddc108..754ce18d 100644
--- a/mac/mtcpnet.c
+++ b/mac/mtcpnet.c
@@ -27,6 +27,8 @@
  * mtcpnet.c - MacTCP interface
  */
 
+#if !TARGET_API_MAC_CARBON
+
 #include <MacTypes.h>
 #include <Devices.h>
 #include <Endian.h>
@@ -130,8 +132,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),\
@@ -276,6 +279,7 @@ SockAddr mactcp_namelookup(char const *host, char **canonicalname)
     OSErr err;
     volatile int done = FALSE;
     char *realhost;
+    int realhostlen;
 
     /* Clear the structure. */
     memset(ret, 0, sizeof(struct SockAddr_tag));
@@ -293,9 +297,13 @@ SockAddr mactcp_namelookup(char const *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);
@@ -823,13 +831,7 @@ OSErr CloseResolver(void)
     return noErr;
 }
 
-/* MacTCP doesn't have a services database. */
-int net_service_lookup(char *service)
-{
-
-    return 0;
-}
-
+#endif
 
 /*
  * Local Variables: