Move the 'vers' resources for Mac OS into their own file, to be shared

[sgt/putty] / mac / otnet.c

diff --git a/mac/otnet.c b/mac/otnet.c
index baa7a8a..1033961 100644 (file)
--- a/mac/otnet.c
+++ b/mac/otnet.c
@@ -2,6 +2,10 @@
  * Macintosh OpenTransport networking abstraction
  */
 
+#if TARGET_API_MAC_CARBON
+#define OTCARBONAPPLICATION 1
+#endif
+
 #include <OpenTransport.h>
 #include <OpenTptInternet.h>
 
@@ -74,12 +78,14 @@ void ot_cleanup(void)
     CloseOpenTransport();
 }
 
-SockAddr ot_namelookup(char *host, char **canonicalname)
+SockAddr ot_namelookup(char const *host, char **canonicalname)
 {
     SockAddr ret = smalloc(sizeof(struct SockAddr_tag));
     char *realhost;
-    
-    ret->error = OTInetStringToAddress(ot.inetsvc, host, &ret->hostinfo);
+
+    /* Casting away const -- hope OTInetStringToAddress is sensible */
+    ret->error = OTInetStringToAddress(ot.inetsvc, (char *)host,
+                                      &ret->hostinfo);
     ret->resolved = TRUE;
 
     if (ret->error == kOTNoError)
@@ -91,7 +97,7 @@ SockAddr ot_namelookup(char *host, char **canonicalname)
     return ret;
 }
 
-SockAddr ot_nonamelookup(char *host)
+SockAddr ot_nonamelookup(char const *host)
 {
     SockAddr ret = smalloc(sizeof(struct SockAddr_tag));
     
@@ -467,7 +473,7 @@ void ot_recv(Actual_Socket s)
     do {
        o = OTRcv(s->ep, buf, sizeof(buf), &flags);
        if (o > 0)
-           plug_receive(s->plug, 0, buf, sizeof(buf));
+           plug_receive(s->plug, 0, buf, o);
        if (o < 0 && o != kOTNoDataErr)
            plug_closing(s->plug, NULL, 0, 0); /* XXX Error msg */
     } while (o > 0);