From 1602e8e2f4fe6b26d37ad570389ade446e593a37 Mon Sep 17 00:00:00 2001
From: Eric Doughty-Papassideris <eric.doughty@gmail.com>
Date: Sat, 21 Jan 2012 15:52:04 +0100
Subject: [PATCH 1/3] MSG_NOSIGNAL not defined on mac os x

---
 lib/pure/sockets.nim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pure/sockets.nim b/lib/pure/sockets.nim
index c00dcc80be..54dc8ccd25 100755
--- a/lib/pure/sockets.nim
+++ b/lib/pure/sockets.nim
@@ -625,7 +625,7 @@ proc skip*(socket: TSocket) =
 
 proc send*(socket: TSocket, data: pointer, size: int): int =
   ## sends data to a socket.
-  when defined(windows):
+  when defined(windows) or defined(macosx):
     result = send(cint(socket), data, size, 0'i32)
   else:
     result = send(cint(socket), data, size, int32(MSG_NOSIGNAL))

From 374a4cdb8ae2c3d7d4789e079bbf1cb542acb4eb Mon Sep 17 00:00:00 2001
From: Eric Doughty-Papassideris <eric.doughty@gmail.com>
Date: Sat, 21 Jan 2012 16:49:45 +0100
Subject: [PATCH 2/3] On Mac OS X 10.5, realpath does not allocate the buffer
 on its own

---
 lib/pure/os.nim | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/pure/os.nim b/lib/pure/os.nim
index 44811589aa..a57b45b323 100755
--- a/lib/pure/os.nim
+++ b/lib/pure/os.nim
@@ -151,6 +151,10 @@ else: # UNIX-like operating system
     ScriptExt* = ""
     DynlibFormat* = "lib$1.so"
 
+when defined(macosx):
+  var
+    pathMax {.importc: "PATH_MAX", header: "<stdlib.h>".}: cint
+
 const
   ExtSep* = '.'
     ## The character which separates the base filename from the extension;
@@ -505,6 +509,12 @@ proc expandFilename*(filename: string): string {.rtl, extern: "nos$1".} =
     var L = GetFullPathNameA(filename, 3072'i32, result, unused)
     if L <= 0'i32 or L >= 3072'i32: OSError()
     setLen(result, L)
+  when defined(macosx):
+    # On Mac OS X 10.5, realpath does not allocate the buffer on its own
+    var pathBuffer: cstring = newString(pathMax)
+    var resultBuffer = realpath(filename, pathBuffer)
+    if resultBuffer == nil: OSError()
+    result = $resultBuffer
   else:
     var res = realpath(filename, nil)
     if res == nil: OSError()

From 42e74aaf8ebb3801b009ce735950f7d4fc946fcf Mon Sep 17 00:00:00 2001
From: Eric Doughty-Papassideris <eric.doughty@gmail.com>
Date: Sat, 21 Jan 2012 17:51:58 +0100
Subject: [PATCH 3/3] Less likely to overload struct timeval

---
 lib/pure/sockets.nim | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/lib/pure/sockets.nim b/lib/pure/sockets.nim
index 54dc8ccd25..c21c0c9412 100755
--- a/lib/pure/sockets.nim
+++ b/lib/pure/sockets.nim
@@ -428,6 +428,11 @@ proc connectAsync*(socket: TSocket, name: string, port = TPort(0),
   if not success: OSError()
 
 
+proc timeValFromMilliseconds(timeout = 500): TTimeVal =
+  if timeout != -1:
+    var seconds = timeout div 1000
+    result.tv_sec = seconds
+    result.tv_usec = (timeout - seconds * 1000) * 1000
 #proc recvfrom*(s: TWinSocket, buf: cstring, len, flags: cint, 
 #               fromm: ptr TSockAddr, fromlen: ptr cint): cint 
 
@@ -460,9 +465,7 @@ proc select*(readfds, writefds, exceptfds: var seq[TSocket],
   ## You can determine whether a socket is ready by checking if it's still
   ## in one of the TSocket sequences.
 
-  var tv: TTimeVal
-  tv.tv_sec = 0
-  tv.tv_usec = timeout * 1000
+  var tv {.noInit.}: TTimeVal = timeValFromMilliseconds(timeout)
   
   var rd, wr, ex: TFdSet
   var m = 0
@@ -480,10 +483,8 @@ proc select*(readfds, writefds, exceptfds: var seq[TSocket],
   pruneSocketSet(exceptfds, (ex))
 
 proc select*(readfds, writefds: var seq[TSocket], 
-             timeout = 500): int = 
-  var tv: TTimeVal
-  tv.tv_sec = 0
-  tv.tv_usec = timeout * 1000
+             timeout = 500): int =
+  var tv {.noInit.}: TTimeVal = timeValFromMilliseconds(timeout)
   
   var rd, wr: TFdSet
   var m = 0
@@ -499,10 +500,8 @@ proc select*(readfds, writefds: var seq[TSocket],
   pruneSocketSet(writefds, (wr))
 
 proc selectWrite*(writefds: var seq[TSocket], 
-                  timeout = 500): int = 
-  var tv: TTimeVal
-  tv.tv_sec = 0
-  tv.tv_usec = timeout * 1000
+                  timeout = 500): int =
+  var tv {.noInit.}: TTimeVal = timeValFromMilliseconds(timeout)
   
   var wr: TFdSet
   var m = 0
@@ -515,11 +514,8 @@ proc selectWrite*(writefds: var seq[TSocket],
   
   pruneSocketSet(writefds, (wr))
 
-
-proc select*(readfds: var seq[TSocket], timeout = 500): int = 
-  var tv: TTimeVal
-  tv.tv_sec = 0
-  tv.tv_usec = timeout * 1000
+proc select*(readfds: var seq[TSocket], timeout = 500): int =
+  var tv {.noInit.}: TTimeVal = timeValFromMilliseconds(timeout)
   
   var rd: TFdSet
   var m = 0