X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=mac%2Fotnet.c;h=06fbea2bf2ea8b70fb3309ef76e8ac2d7c210592;hb=e689a94ccf273a8fdfd53ddf8933f7fdeb6bebe2;hp=baa7a8a54016ac80cd0c4a45c8b2ae77f6d75339;hpb=8de5329f7bd129beda33d0407516b80e8ae586ba;p=PuTTY_svn.git

diff --git a/mac/otnet.c b/mac/otnet.c
index baa7a8a5..06fbea2b 100644
--- a/mac/otnet.c
+++ b/mac/otnet.c
@@ -2,6 +2,11 @@
  * Macintosh OpenTransport networking abstraction
  */
 
+#if TARGET_API_MAC_CARBON
+#define OTCARBONAPPLICATION 1
+#endif
+
+#include <Files.h> /* Needed by OpenTransportInternet.h */
 #include <OpenTransport.h>
 #include <OpenTptInternet.h>
 
@@ -74,12 +79,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 +98,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 +474,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);